Skip to content

G
gitlab-ce
Commit ca3a92dd authored by Stan Hu's avatar Stan Hu
Browse files
Options

Update gems to use Faraday v1.0.1 

This commit updates all gems that need Faraday v1.x and updates to
Faraday v1.0.1:

faraday v1.0.1:
- Upgrade notes:
  https://github.com/lostisland/faraday/blob/master/UPGRADING.md
- Changelog:
  https://github.com/lostisland/faraday/blob/master/CHANGELOG.md

We don't appear to have any custom `Faraday::Adapter` or uses of
`Faraday::Error` in our dependencies.

gitlab-fog-azure-rm v0.9.0: This updates to the latest Azure storage
libraries so that this gem no longer depends on a preview Gem release
dated over 3 years ago:
* Diff:
  https://gitlab.com/gitlab-org/gitlab-fog-azure-rm/-/compare/v0.8.1...v0.9.0

asana v0.10.2: This removes a few Ruby 2.7 deprecations and updates to
Faraday v1.0:
* Diff: https://github.com/Asana/ruby-asana/compare/v0.10.0..v0.10.2

sentry-raven v3.0.4: This fixes a few minor bugs:
* Diff: https://github.com/getsentry/raven-ruby/compare/v2.9.0..v3.0.0
* Changelog:
  https://github.com/getsentry/raven-ruby/blob/master/CHANGELOG.md

danger v8.0.1: This fixes a number of issues
(https://github.com/danger/danger/blob/master/CHANGELOG.md), but we
aleady use this in a separate image
(registry.gitlab.com/gitlab-org/gitlab-build-images:danger). This is
only needed for local development.

elasticsearch v6.8.2:
https://github.com/elastic/elasticsearch-ruby/compare/v6.8.0..v6.8.2

Closes https://gitlab.com/gitlab-org/gitlab/-/issues/224296
parent 3aefe1d1
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 52 deletions
Gemfile
View file @ ca3a92dd
......@@ -21,7 +21,7 @@ gem 'pg', '~> 1.1'
gem 'rugged', '~> 0.28'
gem 'grape-path-helpers', '~> 1.3'
gem 'faraday', '~> 0.12'
gem 'faraday', '~> 1.0'
gem 'marginalia', '~> 1.9.0'
# Authentication libraries
......@@ -119,7 +119,7 @@ gem 'fog-local', '~> 0.6'
gem 'fog-openstack', '~> 1.0'
gem 'fog-rackspace', '~> 0.1.1'
gem 'fog-aliyun', '~> 0.3'
gem 'gitlab-fog-azure-rm', '~> 0.8', require: false
gem 'gitlab-fog-azure-rm', '~> 0.9', require: false
# for Google storage
gem 'google-api-client', '~> 0.33'
......@@ -133,7 +133,7 @@ gem 'seed-fu', '~> 2.3.7'
# Search
gem 'elasticsearch-model', '~> 6.1'
gem 'elasticsearch-rails', '~> 6.1', require: 'elasticsearch/rails/instrumentation'
gem 'elasticsearch-api', '~> 6.8'
gem 'elasticsearch-api', '~> 6.8.2'
gem 'aws-sdk-core', '~> 3'
gem 'aws-sdk-cloudformation', '~> 1'
gem 'aws-sdk-s3', '~> 1'
......@@ -249,9 +249,7 @@ gem 'slack-messenger', '~> 2.3.3'
gem 'hangouts-chat', '~> 0.0.5'
# Asana integration
# asana 0.10.1 needs faraday 1.0
# https://gitlab.com/gitlab-org/gitlab/-/issues/224296
gem 'asana', '0.10.0'
gem 'asana', '0.10.2'
# FogBugz integration
gem 'ruby-fogbugz', '~> 0.2.1'
......@@ -304,7 +302,7 @@ gem "gitlab-license", "~> 1.0"
gem 'rack-attack', '~> 6.3.0'
# Sentry integration
gem 'sentry-raven', '~> 2.9'
gem 'sentry-raven', '~> 3.0'
gem 'premailer-rails', '~> 1.10.3'
......@@ -337,7 +335,7 @@ end
group :development do
gem 'brakeman', '~> 4.2', require: false
gem 'danger', '~> 6.0', require: false
gem 'danger', '~> 8.0', require: false
gem 'letter_opener_web', '~> 1.3.4'
......
Gemfile.lock
View file @ ca3a92dd
......@@ -76,9 +76,9 @@ GEM
apollo_upload_server (2.0.2)
graphql (>= 1.8)
rails (>= 4.2)
asana (0.10.0)
faraday (~> 0.9)
faraday_middleware (~> 0.9)
asana (0.10.2)
faraday (~> 1.0)
faraday_middleware (~> 1.0)
faraday_middleware-multi_json (~> 0.0)
oauth2 (~> 1.4)
asciidoctor (2.0.10)
......@@ -112,15 +112,13 @@ GEM
aws-sigv4 (~> 1.1)
aws-sigv4 (1.2.1)
aws-eventstream (~> 1, >= 1.0.2)
azure-core (0.1.15)
faraday (~> 0.9)
faraday_middleware (~> 0.10)
nokogiri (~> 1.6)
azure-storage (0.15.0.preview)
azure-core (~> 0.1)
faraday (~> 0.9)
faraday_middleware (~> 0.10)
nokogiri (~> 1.6, >= 1.6.8)
azure-storage-blob (2.0.0)
azure-storage-common (~> 2.0)
nokogiri (~> 1.10.4)
azure-storage-common (2.0.1)
faraday (~> 1.0)
faraday_middleware (~> 1.0.0.rc1)
nokogiri (~> 1.10.4)
babosa (1.0.2)
base32 (0.3.2)
batch-loader (1.4.0)
......@@ -200,15 +198,15 @@ GEM
css_parser (1.7.0)
addressable
daemons (1.2.6)
danger (6.0.9)
danger (8.0.5)
claide (~> 1.0)
claide-plugins (>= 0.9.2)
colored2 (~> 3.1)
cork (~> 0.1)
faraday (~> 0.9)
faraday (>= 0.9.0, < 2.0)
faraday-http-cache (~> 2.0)
git (~> 1.5)
kramdown (~> 2.0)
git (~> 1.7)
kramdown (~> 2.3)
kramdown-parser-gfm (~> 1.0)
no_proxy_fix
octokit (~> 4.7)
......@@ -284,18 +282,18 @@ GEM
ecma-re-validator (0.2.1)
regexp_parser (~> 1.2)
ed25519 (1.2.4)
elasticsearch (6.8.0)
elasticsearch-api (= 6.8.0)
elasticsearch-transport (= 6.8.0)
elasticsearch-api (6.8.0)
elasticsearch (6.8.2)
elasticsearch-api (= 6.8.2)
elasticsearch-transport (= 6.8.2)
elasticsearch-api (6.8.2)
multi_json
elasticsearch-model (6.1.0)
elasticsearch-model (6.1.1)
activesupport (> 3)
elasticsearch (> 1)
elasticsearch (~> 6)
hashie
elasticsearch-rails (6.1.0)
elasticsearch-transport (6.8.0)
faraday
elasticsearch-rails (6.1.1)
elasticsearch-transport (6.8.2)
faraday (~> 1)
multi_json
email_reply_trimmer (0.1.6)
email_spec (2.2.0)
......@@ -320,15 +318,15 @@ GEM
factory_bot_rails (5.1.0)
factory_bot (~> 5.1.0)
railties (>= 4.2.0)
faraday (0.17.3)
faraday (1.0.1)
multipart-post (>= 1.2, < 3)
faraday-cookie_jar (0.0.6)
faraday (>= 0.7.4)
faraday-cookie_jar (0.0.7)
faraday (>= 0.8.0)
http-cookie (~> 1.0.0)
faraday-http-cache (2.0.0)
faraday (~> 0.8)
faraday_middleware (0.14.0)
faraday (>= 0.7.4, < 1.0)
faraday-http-cache (2.2.0)
faraday (>= 0.8)
faraday_middleware (1.0.0)
faraday (~> 1.0)
faraday_middleware-aws-sigv4 (0.3.0)
aws-sigv4 (~> 1.0)
faraday (>= 0.15)
......@@ -413,14 +411,16 @@ GEM
gettext_i18n_rails (>= 0.7.1)
po_to_json (>= 1.0.0)
rails (>= 3.2.0)
git (1.5.0)
git (1.7.0)
rchardet (~> 1.8)
gitaly (13.3.0.pre.rc2)
grpc (~> 1.0)
github-markup (1.7.0)
gitlab-chronic (0.10.5)
numerizer (~> 0.2)
gitlab-fog-azure-rm (0.8.1)
azure-storage (~> 0.15.0.preview)
gitlab-fog-azure-rm (0.9.0)
azure-storage-blob (~> 2.0)
azure-storage-common (~> 2.0)
fog-core (= 2.1.0)
fog-json (~> 1.2.0)
mime-types
......@@ -907,6 +907,7 @@ GEM
ffi (>= 1.0.6)
msgpack (>= 0.4.3)
optimist (>= 3.0.0)
rchardet (1.8.0)
rdoc (6.1.2)
re2 (1.2.0)
recaptcha (4.13.1)
......@@ -1056,8 +1057,8 @@ GEM
selenium-webdriver (3.142.6)
childprocess (>= 0.5, < 4.0)
rubyzip (>= 1.2.2)
sentry-raven (2.9.0)
faraday (>= 0.7.6, < 1.0)
sentry-raven (3.0.4)
faraday (>= 1.0)
settingslogic (2.0.9)
sexp_processor (4.12.0)
shellany (0.0.1)
......@@ -1221,7 +1222,7 @@ DEPENDENCIES
addressable (~> 2.7)
akismet (~> 3.0)
apollo_upload_server (~> 2.0.2)
asana (= 0.10.0)
asana (= 0.10.2)
asciidoctor (~> 2.0.10)
asciidoctor-include-ext (~> 0.3.1)
asciidoctor-plantuml (~> 0.0.12)
......@@ -1254,7 +1255,7 @@ DEPENDENCIES
connection_pool (~> 2.0)
countries (~> 3.0)
creole (~> 0.5.0)
danger (~> 6.0)
danger (~> 8.0)
database_cleaner (~> 1.7.0)
deckar01-task_list (= 2.3.1)
default_value_for (~> 3.3.0)
......@@ -1268,7 +1269,7 @@ DEPENDENCIES
doorkeeper (~> 5.3.0)
doorkeeper-openid_connect (~> 1.7.4)
ed25519 (~> 1.2)
elasticsearch-api (~> 6.8)
elasticsearch-api (~> 6.8.2)
elasticsearch-model (~> 6.1)
elasticsearch-rails (~> 6.1)
email_reply_trimmer (~> 0.1)
......@@ -1276,7 +1277,7 @@ DEPENDENCIES
erubi (~> 1.9.0)
escape_utils (~> 1.1)
factory_bot_rails (~> 5.1.0)
faraday (~> 0.12)
faraday (~> 1.0)
faraday_middleware-aws-sigv4 (~> 0.3.0)
fast_blank
ffaker (~> 2.10)
......@@ -1301,7 +1302,7 @@ DEPENDENCIES
gitaly (~> 13.3.0.pre.rc1)
github-markup (~> 1.7.0)
gitlab-chronic (~> 0.10.5)
gitlab-fog-azure-rm (~> 0.8)
gitlab-fog-azure-rm (~> 0.9)
gitlab-labkit (= 0.12.1)
gitlab-license (~> 1.0)
gitlab-mail_room (~> 0.0.6)
......@@ -1440,7 +1441,7 @@ DEPENDENCIES
scss_lint (~> 0.56.0)
seed-fu (~> 2.3.7)
selenium-webdriver (~> 3.142)
sentry-raven (~> 2.9)
sentry-raven (~> 3.0)
settingslogic (~> 2.0.9)
shoulda-matchers (~> 4.0.1)
sidekiq (~> 5.2.7)
......
changelogs/unreleased/sh-update-faraday-and-other-gems.yml 0 → 100644
View file @ ca3a92dd
---
title: Update gems to use Faraday v1.0.1
merge_request: 41623
author:
type: other
ee/spec/lib/gitlab/elastic/client_spec.rb
View file @ ca3a92dd
......@@ -37,8 +37,10 @@ RSpec.describe Gitlab::Elastic::Client do
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=746fa5a8a7f3859697d46a754550b1eb357413c481c91d22f17b8a0129c0121e',
'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=61a04383d24ca21f7ec80cd56c252bc3ecd3a306dbe6681e615416b4b9ec5ecb',
'Content-Type' => 'application/json',
# User-Agent is a part of SignedHeaders; if this changes, the signature will change
'User-Agent' => 'Faraday v1.0.1',
'X-Amz-Content-Sha256' => 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855',
'X-Amz-Date' => '20170303T133952Z'
})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7