X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=Gemfile;h=3e4e281bcfdcf7e85617204d8c46ec2e9ca0fcac;hb=e633f76da3c7443f7a0b7278e95add0db51f4bf4;hp=76ef083ff4093a95f580bef802539d2d0feff7c6;hpb=94c17ed20866cecf698f08f5986c5ec7aee0ebe7;p=pettanr%2Fpettanr.git

diff --git a/Gemfile b/Gemfile
index 76ef083f..3e4e281b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,3 +1,4 @@
+ruby '2.1.6'
 source 'https://rubygems.org'
 gem 'specific_install'
 
@@ -12,9 +13,7 @@ gem 'underscore-rails'
 gem 'rails-timeago'
 gem 'kaminari'
 gem 'sanitize'
-gem 'aws-s3'
-#gem 'aws-s3', :git => 'https://github.com/bartoszkopinski/aws-s3'
-#gem 'aws-sdk', '~> 2.0'
+gem 'aws-sdk', '~> 2.0'
 gem 'awesome_nested_set', '~> 3.0'
 gem 'validates_existence'
 gem "validate_url"
@@ -66,6 +65,7 @@ gem 'bcrypt-ruby', '~> 3.0.0'
 group :production do
   #gem 'pg'
   #gem 'therubyracer-heroku'
+  #gem 'rails_12factor'
 end
 
 group :mgk do