Commit 3fa86fb1 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'rails5-aws-sdk-gem-versions' into 'master'

Use same aws-sdk gem versions for Rails 5 as for Rails 4

See merge request gitlab-org/gitlab-ee!6712
parents 66e715d3 81ac95b4
......@@ -72,14 +72,14 @@ GEM
encryptor (~> 3.0.0)
attr_required (1.0.0)
awesome_print (1.8.0)
aws-sdk (2.11.64)
aws-sdk-resources (= 2.11.64)
aws-sdk-core (2.11.64)
aws-sdk (2.9.32)
aws-sdk-resources (= 2.9.32)
aws-sdk-core (2.9.32)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
aws-sdk-resources (2.11.64)
aws-sdk-core (= 2.11.64)
aws-sigv4 (1.0.2)
aws-sdk-resources (2.9.32)
aws-sdk-core (= 2.9.32)
aws-sigv4 (1.0.0)
axiom-types (0.1.1)
descendants_tracker (~> 0.0.4)
ice_nine (~> 0.11.0)
......@@ -227,8 +227,8 @@ GEM
multipart-post (>= 1.2, < 3)
faraday_middleware (0.12.2)
faraday (>= 0.7.4, < 1.0)
faraday_middleware-aws-signers-v4 (0.1.9)
aws-sdk-resources (>= 2, < 3)
faraday_middleware-aws-signers-v4 (0.1.7)
aws-sdk-resources (~> 2)
faraday (~> 0.9)
faraday_middleware-multi_json (0.0.6)
faraday_middleware
......@@ -459,7 +459,7 @@ GEM
activesupport
multipart-post
oauth (~> 0.5, >= 0.5.0)
jmespath (1.4.0)
jmespath (1.3.1)
jquery-atwho-rails (1.3.2)
json (1.8.6)
json-jwt (1.9.4)
......
---
title: Use same gem versions for Rails 5 as for Rails 4
merge_request: 6712
author: Jasper Maes
type: fixed
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