Merge pull request #885 from tonyta/updates-rails-versions-for-test-a…

…nd-dev Updates rails versions for test and dev
rails-api · Apr 27, 2015 · b706e52 · b706e52
2 parents 1577969 + b224d50
commit b706e52
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,13 +15,12 @@ install:
   - bundle install --retry=3
 
 env:
-  - "RAILS_VERSION=3.2"
   - "RAILS_VERSION=4.0"
   - "RAILS_VERSION=4.1"
+  - "RAILS_VERSION=4.2"
   - "RAILS_VERSION=master"
 
 matrix:
   allow_failures:
     - rvm: ruby-head
     - env: "RAILS_VERSION=master"
-    - env: "RAILS_VERSION=3.2"
diff --git a/Gemfile b/Gemfile
@@ -5,7 +5,7 @@ gemspec
 
 gem "minitest"
 
-version = ENV["RAILS_VERSION"] || "4.1"
+version = ENV["RAILS_VERSION"] || "4.2"
 
 if version == "master"
   gem "rails", github: "rails/rails"