ditkrg/active_model_serializers
4
0
Fork 0
mirror of https://github.com/ditkrg/active_model_serializers.git synced 2026-01-24 06:46:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #885 from tonyta/updates-rails-versions-for-test-and-dev

Browse Source 
Updates rails versions for test and dev
This commit is contained in:
João Moura 2015-04-27 15:08:58 -03:00
commit b706e521ef
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -15,13 +15,12 @@ install:
- bundle install --retry=3 - bundle install --retry=3
env: env:
- "RAILS_VERSION=3.2"
- "RAILS_VERSION=4.0" - "RAILS_VERSION=4.0"
- "RAILS_VERSION=4.1" - "RAILS_VERSION=4.1"
- "RAILS_VERSION=4.2"
- "RAILS_VERSION=master" - "RAILS_VERSION=master"
matrix: matrix:
allow_failures: allow_failures:
- rvm: ruby-head - rvm: ruby-head
- env: "RAILS_VERSION=master" - env: "RAILS_VERSION=master"
- env: "RAILS_VERSION=3.2"

2
Gemfile
View File

@ -5,7 +5,7 @@ gemspec
gem "minitest" gem "minitest"
version = ENV["RAILS_VERSION"] || "4.1" version = ENV["RAILS_VERSION"] || "4.2"
if version == "master" if version == "master"
gem "rails", github: "rails/rails" gem "rails", github: "rails/rails"