summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-28 00:08:46 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-28 00:08:46 +0000
commitee7de3a24d62376916d78649d7e477a184b2e203 (patch)
treeb782b1d7e7762cdcc1a54073a4115fdb3ad7a22c /Gemfile
parente4ea43b2b85ad5f3115f00220601eb719705139a (diff)
downloadgitlab-ce-ee7de3a24d62376916d78649d7e477a184b2e203.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile5
1 files changed, 2 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index 7ace632ff79..2ad24b9e1f5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -132,9 +132,8 @@ gem 'seed-fu', '~> 2.3.7'
gem 'elasticsearch-model', '~> 6.1'
gem 'elasticsearch-rails', '~> 6.1', require: 'elasticsearch/rails/instrumentation'
gem 'elasticsearch-api', '~> 6.8'
-gem 'aws-sdk-core', '~> 3'
-gem 'aws-sdk-cloudformation', '~> 1'
-gem 'faraday_middleware-aws-sigv4'
+gem 'aws-sdk'
+gem 'faraday_middleware-aws-signers-v4'
# Markdown and HTML processing
gem 'html-pipeline', '~> 2.12'