Skip to content

Commit

Permalink
Bump Rails version to 5.0.0.beta2
Browse files Browse the repository at this point in the history
  • Loading branch information
jcoyne committed Feb 3, 2016
1 parent c425c2e commit d57c339
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ matrix:
env: "RAILS_VERSION=4.2.5"
- rvm: 2.2.4
env: "RAILS_VERSION=4.2.5"
- rvm: 2.3.0
env: "RAILS_VERSION=5.0.0.beta2"
- rvm: jruby-9.0.4.0
env: "RAILS_VERSION=4.2.5 JRUBY_OPTS=\"-J-Xms512m -J-Xmx1024m\""
allow_failures:
Expand Down
2 changes: 0 additions & 2 deletions spec/test_app_templates/Gemfile.extra
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@

if ENV['RAILS_VERSION'] =~ /^5\.0/ || ENV['RAILS_VERSION'] == 'edge'
gem 'rails-controller-testing', github: 'rails/rails-controller-testing'
gem 'capybara', github: 'jnicklas/capybara' # we need 2.6.0 to be released
gem 'rspec-mocks', github: 'rspec/rspec-mocks' # we need 3.5.0 to be released
gem 'rspec-expectations', github: 'rspec/rspec-expectations' # we need 3.5.0 to be released
gem 'rspec-support', github: 'rspec/rspec-support' # we need 3.5.0 to be released
Expand All @@ -10,5 +9,4 @@ if ENV['RAILS_VERSION'] =~ /^5\.0/ || ENV['RAILS_VERSION'] == 'edge'
gem 'rspec-rails', github: 'rspec/rspec-rails' # we need 3.5.0 to be released
gem 'kaminari', github: 'amatsuda/kaminari' # need > 0.16.3
gem 'deprecation', github: 'jcoyne/deprecation', branch: 'no_alias_method_chain'
gem 'turbolinks', github: 'basecamp/turbolinks', branch: 'v5' # need >= 5.0.0
end

0 comments on commit d57c339

Please sign in to comment.