summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-31 21:05:24 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-31 21:05:24 +0000
commitc741c26fa0743e76c9331aa214ebe16559f1d2a6 (patch)
tree183d27ae527c89173872b4f9702bb64b3ac386a4 /Gemfile
parente9fe125578e745a7b18bed97eb3653bf5c0f4035 (diff)
downloadgitlab-ce-c741c26fa0743e76c9331aa214ebe16559f1d2a6.tar.gz
Add latest changes from gitlab-org/gitlab@12-7-stable-ee
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile5
1 files changed, 2 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index 0c3974ceeba..04c9f9808a7 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'