diff --git a/Gemfile b/Gemfile index 6f9340ebd7dcbf6d2487b99334394be5a05a105f..f62604e414f911793bbd9d9be2b693b177b2bd01 100644 --- a/Gemfile +++ b/Gemfile @@ -104,7 +104,7 @@ gem 'graphql', '~> 1.11.10' gem 'graphiql-rails', '~> 1.8' gem 'apollo_upload_server', '~> 2.1.0' gem 'graphql-docs', '~> 1.6.0', group: [:development, :test] -gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import) +gem 'graphlient', '~> 0.5.0' # Used by BulkImport feature (group::import) gem 'hashie' # Disable strong_params so that Mash does not respond to :permitted? diff --git a/Gemfile.lock b/Gemfile.lock index 9a67aa1b0170aff246f80150cfffe82521b374c9..2340b25bb9a1304e7400495b8bb4fac34f7aee89 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -349,13 +349,17 @@ GEM factory_bot_rails (6.2.0) factory_bot (~> 6.2.0) railties (>= 5.0.0) - faraday (1.4.2) + faraday (1.10.0) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.1) - multipart-post (>= 1.2, < 3) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) ruby2_keywords (>= 0.0.4) faraday-cookie_jar (0.0.7) faraday (>= 0.8.0) @@ -365,9 +369,15 @@ GEM faraday-excon (1.1.0) faraday-http-cache (2.2.0) faraday (>= 0.8) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.3) + multipart-post (>= 1.2, < 3) faraday-net_http (1.0.1) - faraday-net_http_persistent (1.1.0) - faraday_middleware (1.0.0) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + faraday_middleware (1.2.0) faraday (~> 1.0) faraday_middleware-aws-sigv4 (0.3.0) aws-sigv4 (~> 1.0) @@ -567,14 +577,14 @@ GEM graphiql-rails (1.8.0) railties sprockets-rails - graphlient (0.4.0) + graphlient (0.5.0) faraday (>= 1.0) faraday_middleware graphql-client graphql (1.11.10) - graphql-client (0.16.0) + graphql-client (0.17.0) activesupport (>= 3.0) - graphql (~> 1.8) + graphql (~> 1.10) graphql-docs (1.6.0) commonmarker (~> 0.16) escape_utils (~> 1.2) @@ -1140,7 +1150,7 @@ GEM nokogiri (>= 1.10.5) rexml ruby-statistics (3.0.0) - ruby2_keywords (0.0.4) + ruby2_keywords (0.0.5) ruby_parser (3.15.0) sexp_processor (~> 4.9) rubyntlm (0.6.2) @@ -1520,7 +1530,7 @@ DEPENDENCIES grape-path-helpers (~> 1.7.0) grape_logging (~> 1.7) graphiql-rails (~> 1.8) - graphlient (~> 0.4.0) + graphlient (~> 0.5.0) graphql (~> 1.11.10) graphql-docs (~> 1.6.0) grpc (~> 1.42.0) diff --git a/ee/spec/lib/gitlab/elastic/client_spec.rb b/ee/spec/lib/gitlab/elastic/client_spec.rb index 1472efc8625d151836112c32fcf48f751e163b2c..3b05f163c7c23a2404c3f31eb86edfb20b33dc75 100644 --- a/ee/spec/lib/gitlab/elastic/client_spec.rb +++ b/ee/spec/lib/gitlab/elastic/client_spec.rb @@ -103,10 +103,10 @@ stub_request(:get, 'http://example-elastic:9200/foo/_all/1') .with( headers: { - 'Authorization' => 'AWS4-HMAC-SHA256 Credential=0/20170303/us-east-1/es/aws4_request, SignedHeaders=content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-opaque-id, Signature=33a12f5ce6863009a29c856204935d454c32202fc9f321131e31fdd3ae5748c6', + 'Authorization' => 'AWS4-HMAC-SHA256 Credential=0/20170303/us-east-1/es/aws4_request, SignedHeaders=content-type;host;user-agent;x-amz-content-sha256;x-amz-date;x-opaque-id, Signature=f5a6cbb46102801ae0dc44fb52a68420a6aa7c92bf7f8245c777348682c93505', 'Content-Type' => 'application/json', # User-Agent is a part of SignedHeaders; if this changes, the signature will change - 'User-Agent' => 'Faraday v1.4.2', + 'User-Agent' => 'Faraday v1.10.0', 'X-Amz-Content-Sha256' => 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855', 'X-Amz-Date' => '20170303T133952Z' })