diff --git a/.ruby-version b/.ruby-version index f33eb12f..93045150 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -ruby-2.0.0 +ruby-2.1.0 diff --git a/.travis.yml b/.travis.yml index 42df522f..d6899322 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ rvm: - 1.9.2 - 1.9.3 - 2.0.0 + - 2.1.0 - jruby - rbx-19mode gemfile: @@ -27,6 +28,10 @@ matrix: - { rvm: 2.0.0, gemfile: test/gemfiles/Gemfile.rails-3.1.x } - { rvm: 2.0.0, gemfile: test/gemfiles/Gemfile.rails-3.2.x } + - { rvm: 2.1.0, gemfile: test/gemfiles/Gemfile.rails-3.0.x } + - { rvm: 2.1.0, gemfile: test/gemfiles/Gemfile.rails-3.1.x } + - { rvm: 2.1.0, gemfile: test/gemfiles/Gemfile.rails-3.2.x } + allow_failures: - { rvm: jruby, gemfile: test/gemfiles/Gemfile.rails-4.0.x } - { rvm: rbx-19mode, gemfile: test/gemfiles/Gemfile.rails-4.0.x }