diff --git a/Gemfile b/Gemfile index d708538c811c1cfc943ed50903d31f8ccad03d7b..f4a84dadd2c51c4a5df15b4b63433f749c30c53a 100644 --- a/Gemfile +++ b/Gemfile @@ -159,7 +159,7 @@ gem 'grape-path-helpers', '~> 2.0.1', feature_category: :api gem 'rack-cors', '~> 2.0.1', require: 'rack/cors' # rubocop:todo Gemfile/MissingFeatureCategory # GraphQL API -gem 'graphql', '~> 2.3.14', feature_category: :api +gem 'graphql', '~> 2.4.1', feature_category: :api gem 'graphql-docs', '~> 5.0.0', group: [:development, :test], feature_category: :api gem 'apollo_upload_server', '~> 2.1.6', feature_category: :api gem 'graphlient', '~> 0.8.0', feature_category: :importers # Used by BulkImport feature (group::import) diff --git a/Gemfile.checksum b/Gemfile.checksum index 9e07bc499b4565debc98f98f2e9e8ec88aeeb5bc..a4a771f27b4c8209ce5412491e9ac64298a87d79 100644 --- a/Gemfile.checksum +++ b/Gemfile.checksum @@ -291,7 +291,7 @@ {"name":"grape_logging","version":"1.8.4","platform":"ruby","checksum":"efcc3e322dbd5d620a68f078733b7db043cf12680144cd03c982f14115c792d1"}, {"name":"graphlient","version":"0.8.0","platform":"ruby","checksum":"98c408da1d083454e9f5e274f3b0b6261e2a0c2b5f2ed7b3ef9441d46f8e7cb1"}, {"name":"graphlyte","version":"1.0.0","platform":"ruby","checksum":"b5af4ab67dde6e961f00ea1c18f159f73b52ed11395bb4ece297fe628fa1804d"}, -{"name":"graphql","version":"2.3.18","platform":"ruby","checksum":"e62cde33a0eeab3a6e31eaf5d9ca0a711d3aea477ab050825404e869fb25a5fc"}, +{"name":"graphql","version":"2.4.1","platform":"ruby","checksum":"eefeb32890fbf9556af88b23a03a0179a4ab5d1a6dea88ba8947ad7c7dd18269"}, {"name":"graphql-client","version":"0.23.0","platform":"ruby","checksum":"f238b8e451676baad06bd15f95396e018192243dcf12c4e6d13fb41d9a2babc1"}, {"name":"graphql-docs","version":"5.0.0","platform":"ruby","checksum":"76baca6e5a803a4b6a9fbbbfdbf16742b7c4c546c8592b6e1a7aa4e79e562d04"}, {"name":"grpc","version":"1.63.0","platform":"aarch64-linux","checksum":"dc75c5fd570b819470781d9512105dddfdd11d984f38b8e60bb946f92d1f79ee"}, diff --git a/Gemfile.lock b/Gemfile.lock index 1ac0cdccbe86e9668034f45f8adc0d82716e1873..ab5d0734052fa258766b9460f39e60eabafcf0b9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -920,7 +920,7 @@ GEM faraday (~> 2.0) graphql-client graphlyte (1.0.0) - graphql (2.3.18) + graphql (2.4.1) base64 fiber-storage graphql-client (0.23.0) @@ -2113,7 +2113,7 @@ DEPENDENCIES grape_logging (~> 1.8, >= 1.8.4) graphlient (~> 0.8.0) graphlyte (~> 1.0.0) - graphql (~> 2.3.14) + graphql (~> 2.4.1) graphql-docs (~> 5.0.0) grpc (= 1.63.0) gssapi (~> 1.3.1) diff --git a/Gemfile.next.checksum b/Gemfile.next.checksum index 56aca4cacdf1a75b1729b2bc7acb8885d33c44b0..ad778053fc051c62d4b884039a5246e5fab683ee 100644 --- a/Gemfile.next.checksum +++ b/Gemfile.next.checksum @@ -292,7 +292,7 @@ {"name":"grape_logging","version":"1.8.4","platform":"ruby","checksum":"efcc3e322dbd5d620a68f078733b7db043cf12680144cd03c982f14115c792d1"}, {"name":"graphlient","version":"0.8.0","platform":"ruby","checksum":"98c408da1d083454e9f5e274f3b0b6261e2a0c2b5f2ed7b3ef9441d46f8e7cb1"}, {"name":"graphlyte","version":"1.0.0","platform":"ruby","checksum":"b5af4ab67dde6e961f00ea1c18f159f73b52ed11395bb4ece297fe628fa1804d"}, -{"name":"graphql","version":"2.3.18","platform":"ruby","checksum":"e62cde33a0eeab3a6e31eaf5d9ca0a711d3aea477ab050825404e869fb25a5fc"}, +{"name":"graphql","version":"2.4.1","platform":"ruby","checksum":"eefeb32890fbf9556af88b23a03a0179a4ab5d1a6dea88ba8947ad7c7dd18269"}, {"name":"graphql-client","version":"0.23.0","platform":"ruby","checksum":"f238b8e451676baad06bd15f95396e018192243dcf12c4e6d13fb41d9a2babc1"}, {"name":"graphql-docs","version":"5.0.0","platform":"ruby","checksum":"76baca6e5a803a4b6a9fbbbfdbf16742b7c4c546c8592b6e1a7aa4e79e562d04"}, {"name":"grpc","version":"1.63.0","platform":"aarch64-linux","checksum":"dc75c5fd570b819470781d9512105dddfdd11d984f38b8e60bb946f92d1f79ee"}, diff --git a/Gemfile.next.lock b/Gemfile.next.lock index 199e5dd93068b91a0017ef7d5b5903767cfe8f28..515c85b60c10853ca5096eaae21092ea6e485e5b 100644 --- a/Gemfile.next.lock +++ b/Gemfile.next.lock @@ -930,7 +930,7 @@ GEM faraday (~> 2.0) graphql-client graphlyte (1.0.0) - graphql (2.3.18) + graphql (2.4.1) base64 fiber-storage graphql-client (0.23.0) @@ -2140,7 +2140,7 @@ DEPENDENCIES grape_logging (~> 1.8, >= 1.8.4) graphlient (~> 0.8.0) graphlyte (~> 1.0.0) - graphql (~> 2.3.14) + graphql (~> 2.4.1) graphql-docs (~> 5.0.0) grpc (= 1.63.0) gssapi (~> 1.3.1) diff --git a/app/graphql/gitlab_schema.rb b/app/graphql/gitlab_schema.rb index 74a093e9717cca46e61a00171444ab21218b1239..f296bd62446515c11a8297489fafff4b57aa3bb7 100644 --- a/app/graphql/gitlab_schema.rb +++ b/app/graphql/gitlab_schema.rb @@ -44,11 +44,11 @@ def multiplex(queries, **kwargs) super(queries, **kwargs) end - def get_type(type_name, context = GraphQL::Query::NullContext) + def get_type(type_name, *other_args) type_name = Gitlab::GlobalId::Deprecations.apply_to_graphql_name(type_name) type_name = Gitlab::Graphql::TypeNameDeprecations.apply_to_graphql_name(type_name) - super(type_name, context) + super(type_name, *other_args) end def id_from_object(object, _type = nil, _ctx = nil) diff --git a/spec/requests/api/graphql/mutations/issues/set_due_date_spec.rb b/spec/requests/api/graphql/mutations/issues/set_due_date_spec.rb index f7c5febe56f8d64ec7d94d6febd2db11beb63ee3..40ecafd1d1645ccd8dfb8d36a90e0b0064d2dc34 100644 --- a/spec/requests/api/graphql/mutations/issues/set_due_date_spec.rb +++ b/spec/requests/api/graphql/mutations/issues/set_due_date_spec.rb @@ -70,7 +70,9 @@ def mutation_response it 'returns an error' do post_graphql_mutation(mutation, current_user: current_user) - expect(graphql_errors).to include(a_hash_including('message' => 'issueSetDueDate has the wrong arguments')) + expect(graphql_errors).to include( + a_hash_including('message' => 'issueSetDueDate must include the following argument: dueDate.') + ) end end