Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Update Rails dependency, add Rails 3.2.x

  • Loading branch information...
commit 77c5268457e05cc1aaefeb22facbb9fe043a3b2e 1 parent 4b79530
@sikachu sikachu authored
View
1  .travis.yml
@@ -11,3 +11,4 @@ gemfile:
- gemfiles/rails2.gemfile
- gemfiles/rails3.gemfile
- gemfiles/rails3_1.gemfile
+ - gemfiles/rails3_2.gemfile
View
6 Appraisals
@@ -12,3 +12,9 @@ appraise "rails3_1" do
gem "rails", "~> 3.1.0"
gem "paperclip", :path => "../"
end
+
+appraise "rails3_2" do
+ gem "rails", "~> 3.2.0"
+ gem "paperclip", :path => "../"
+end
+
View
10 Gemfile.lock
@@ -21,7 +21,7 @@ GEM
activesupport (3.2.1)
i18n (~> 0.6)
multi_json (~> 1.0)
- appraisal (0.4.0)
+ appraisal (0.4.1)
bundler
rake
arel (3.0.0)
@@ -31,7 +31,7 @@ GEM
cucumber (>= 1.0.2)
rdiscount (>= 1.6.8)
rspec (>= 2.6.0)
- aws-sdk (1.2.1)
+ aws-sdk (1.3.4)
httparty (~> 0.7)
json (~> 1.4)
nokogiri (>= 1.4.4)
@@ -76,13 +76,13 @@ GEM
multi_json
multi_xml
i18n (0.6.0)
- json (1.6.3)
+ json (1.6.5)
json_pure (1.6.1)
metaclass (0.0.1)
mime-types (1.16)
mocha (0.10.0)
metaclass (~> 0.0.1)
- multi_json (1.0.3)
+ multi_json (1.0.4)
multi_xml (0.4.1)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
@@ -91,7 +91,7 @@ GEM
rack (1.3.3)
rack-test (0.6.1)
rack (>= 1.0)
- rake (0.9.2)
+ rake (0.9.2.2)
rdiscount (1.6.8)
rspec (2.6.0)
rspec-core (~> 2.6.0)
View
9 gemfiles/rails3_2.gemfile
@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "jruby-openssl", :platform=>:jruby
+gem "rails", "~> 3.2.0"
+gem "paperclip", :path=>"../"
+
+gemspec :path=>"../"

0 comments on commit 77c5268

Please sign in to comment.
Something went wrong with that request. Please try again.