Lock aws-sdk version due to thoughtbot/paperclip#1764

mememenu · Jun 23, 2015 · 2b30241 · 2b30241
1 parent 162e8bd
commit 2b30241
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/Gemfile b/Gemfile
@@ -43,7 +43,7 @@ gem 'omniauth-facebook'
 
 gem 'seed_dump'
 
-gem 'aws-sdk'
+gem 'aws-sdk', '< 2.0'
 
 # pagination
 gem 'kaminari'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -40,12 +40,11 @@ GEM
       tzinfo (~> 1.1)
     api-pagination (4.1.1)
     arel (6.0.0)
-    aws-sdk (2.1.1)
-      aws-sdk-resources (= 2.1.1)
-    aws-sdk-core (2.1.1)
-      jmespath (~> 1.0)
-    aws-sdk-resources (2.1.1)
-      aws-sdk-core (= 2.1.1)
+    aws-sdk (1.60.2)
+      aws-sdk-v1 (= 1.60.2)
+    aws-sdk-v1 (1.60.2)
+      json (~> 1.4)
+      nokogiri (>= 1.4.4)
     bcrypt (3.1.10)
     better_errors (2.1.1)
       coderay (>= 1.0.0)
@@ -98,8 +97,6 @@ GEM
     jbuilder (2.3.0)
       activesupport (>= 3.0.0, < 5)
       multi_json (~> 1.2)
-    jmespath (1.0.2)
-      multi_json (~> 1.0)
     jquery-rails (4.0.4)
       rails-dom-testing (~> 1.0)
       railties (>= 4.2.0)
@@ -253,7 +250,7 @@ PLATFORMS
 DEPENDENCIES
   active_model_serializers
   api-pagination
-  aws-sdk
+  aws-sdk (< 2.0)
   better_errors
   binding_of_caller
   coffee-rails (~> 4.0.0)