Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06

[pettanr/pettanr.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index cb1e1fe..f093162 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,6 @@
+ruby '2.1.6'
 source 'https://rubygems.org'
+gem 'specific_install'
 
 gem 'rails', '~> 4.1.0'
 gem 'devise'
@@ -12,7 +14,8 @@ gem 'rails-timeago'
 gem 'kaminari'
 gem 'sanitize'
 #gem 'aws-s3'
-gem 'aws-sdk', '< 2.0'
+#gem 'aws-s3', :git => 'https://github.com/bartoszkopinski/aws-s3'
+gem 'aws-sdk', '~> 2.0'
 gem 'awesome_nested_set', '~> 3.0'
 gem 'validates_existence'
 gem "validate_url"