From 63f4ecf0f1051faf19fec36e97cdae90a124fca2 Mon Sep 17 00:00:00 2001
From: r888888888 <r888888888@gmail.com>
Date: Mon, 13 Jul 2015 17:57:03 -0700
Subject: [PATCH] fixes #2434: update aws-s3 gem

---
 Gemfile      |  2 +-
 Gemfile.lock | 15 +++++----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/Gemfile b/Gemfile
index 01d739845..dbacb6291 100644
--- a/Gemfile
+++ b/Gemfile
@@ -54,7 +54,7 @@ gem 'twitter'
 gem 'ruby-imagespec', :require => "image_spec", :git => "https://github.com/r888888888/ruby-imagespec.git", :branch => "exif-fixes"
 
 # needed for rails 4.1.0 compat
-gem 'aws-s3', :require => "aws/s3", :git => "https://github.com/fnando/aws-s3.git"
+gem 'aws-s3', :require => "aws/s3"
 
 group :production do
   gem 'newrelic_rpm'
diff --git a/Gemfile.lock b/Gemfile.lock
index 8dc6d1da1..c1e74b6c8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,12 +1,3 @@
-GIT
-  remote: https://github.com/fnando/aws-s3.git
-  revision: fef95c2dc17758f3e417630e794fcfad76eb33b3
-  specs:
-    aws-s3 (0.6.3)
-      builder
-      mime-types
-      xml-simple
-
 GIT
   remote: https://github.com/r888888888/ruby-imagespec.git
   revision: 2dab9811f4abb4fbaeea66feb42e388ba545b2d8
@@ -46,6 +37,10 @@ GEM
     addressable (2.3.6)
     arel (5.0.1.20140414130214)
     awesome_print (1.2.0)
+    aws-s3 (0.6.3)
+      builder
+      mime-types
+      xml-simple
     bcrypt (3.1.10)
     bcrypt (3.1.10-x64-mingw32)
     bcrypt-ruby (3.1.5)
@@ -311,7 +306,7 @@ PLATFORMS
 
 DEPENDENCIES
   awesome_print
-  aws-s3!
+  aws-s3
   bcrypt-ruby
   byebug
   capistrano