Skip to content

Commit 9b7ab39

Browse files
authored
Merge pull request #2194 from rspec/fix-other-builds
Fix other builds
2 parents 4b22d13 + b85407e commit 9b7ab39

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

Gemfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ platforms :jruby do
2020
gem "jruby-openssl"
2121
end
2222

23-
RAILS_VERSION ||= ""
2423
case RAILS_VERSION
2524
when /master/
2625
MAJOR = 6
@@ -30,7 +29,7 @@ when /stable/
3029
MINOR = 0
3130
when nil, false, ""
3231
MAJOR = 5
33-
MINOR = 1
32+
MINOR = 0
3433
else
3534
match = /(\d+)(\.|-)(\d+)/.match(RAILS_VERSION)
3635
MAJOR, MINOR = match.captures.map(&:to_i).compact

Gemfile-rails-dependencies

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,8 @@ when /stable$/
2424
gem rails_gem, :git => "https://github.com/rails/rails.git", :branch => version
2525
end
2626
when nil, false, ""
27-
gem "rails", "~> 5.1.0"
27+
gem "rails", "~> 5.0.0"
2828
gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
29-
gem "puma"
3029
else
3130
gem "rails", version
3231

0 commit comments

Comments
 (0)