Rails 4.0

Test against released Rails 4.0 and Rails 4.1 dev; use Rails 4.0 by
default in development.
This commit is contained in:
Andrew Haines 2013-06-25 17:03:52 +01:00
parent bbb7af358c
commit 78e1af49f8
4 changed files with 7 additions and 4 deletions

View File

@ -14,7 +14,8 @@ env:
- "RAILS_VERSION=3.2"
- "RAILS_VERSION=3.1"
- "RAILS_VERSION=3.0"
- "RAILS_VERSION=4.1"
matrix:
allow_failures:
- env: "RAILS_VERSION=4.0"
- env: "RAILS_VERSION=4.1"

View File

@ -8,9 +8,9 @@ end
platforms :jruby do
gem "minitest", ">= 3.0"
gem "activerecord-jdbcsqlite3-adapter"
gem "activerecord-jdbcsqlite3-adapter", ">= 1.3.0.beta2"
end
version = ENV["RAILS_VERSION"] || "3.2"
version = ENV["RAILS_VERSION"] || "4.0"
eval_gemfile File.expand_path("../gemfiles/#{version}.gemfile", __FILE__)

View File

@ -1,3 +1,3 @@
gem "rails", github: "rails/rails", branch: "4-0-0"
gem "rails", "~> 4.0.0"
gem "mongoid", github: "mongoid/mongoid"
gem "devise", github: "plataformatec/devise"

2
gemfiles/4.1.gemfile Normal file
View File

@ -0,0 +1,2 @@
gem "rails", github: "rails/rails"
gem "devise", github: "plataformatec/devise"