Skip to content

Commit 2417545

Browse files
committed
Merge pull request #859 from rspec/rails-version-bumps
Bump rails versions
2 parents 15e32bc + efb12d7 commit 2417545

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ rvm:
77
- 1.9.3
88
- 2.0.0
99
env:
10-
- RAILS_VERSION=4.0.0
11-
- RAILS_VERSION=3.2.13
10+
- RAILS_VERSION=4.0.2
11+
- RAILS_VERSION=3.2.16
1212
- RAILS_VERSION=3.1.12
1313
- RAILS_VERSION=3.0.20
1414
- RAILS_VERSION=4-0-stable
@@ -33,8 +33,8 @@ matrix:
3333
- rvm: 1.9.2
3434
env: RAILS_VERSION=4-0-stable
3535
- rvm: 1.8.7
36-
env: RAILS_VERSION=4.0.0
36+
env: RAILS_VERSION=4.0.2
3737
- rvm: 1.9.2
38-
env: RAILS_VERSION=4.0.0
38+
env: RAILS_VERSION=4.0.2
3939
allow_failures:
4040
- env: RAILS_VERSION=master

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ when /master/
4949
when /stable$/
5050
gem "rails", :git => "git://github.com/rails/rails.git", :branch => version
5151
when nil, false, ""
52-
gem "rails", "3.2.13"
52+
gem "rails", "3.2.16"
5353
else
5454
gem "rails", version
5555
end

0 commit comments

Comments
 (0)