Updated Amazon S3 for Paperclip

ngehani · Nov 5, 2013 · 982e205 · 982e205
1 parent 418a23c
commit 982e205
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Gemfile b/Gemfile
@@ -6,7 +6,7 @@ gem 'jquery-rails'
 gem 'devise', '~> 3.1.1'
 gem 'simple_form', '~> 3.0.0.rc'
 gem "paperclip", "~> 3.0"
-gem 'aws-sdk'
+gem 'aws-sdk', '~> 1.20.0'
 gem "masonry-rails", '~> 0.2.0'
 gem 'faker'
 gem 'will_paginate', '3.0.3'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -36,9 +36,9 @@ GEM
     acts_as_follower (0.2.0)
     arel (4.0.0)
     atomic (1.1.14)
-    aws-sdk (1.18.0)
+    aws-sdk (1.20.0)
       json (~> 1.4)
-      nokogiri (< 1.6.0)
+      nokogiri (>= 1.4.4, < 1.6.0)
       uuidtools (~> 2.1)
     bcrypt-ruby (3.1.2)
     bootstrap-will_paginate (0.0.10)
@@ -163,7 +163,7 @@ PLATFORMS
 
 DEPENDENCIES
   acts_as_follower
-  aws-sdk
+  aws-sdk (~> 1.20.0)
   bootstrap-sass!
   bootstrap-will_paginate
   coffee-rails (~> 4.0.0)