Skip to content

Commit 65d85a3

Browse files
committed
Revert to initial changes
See : 33e41f2
1 parent ae334b5 commit 65d85a3

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ if RUBY_VERSION < '2.0.0'
4444
gem 'mime-types', '< 3'
4545
end
4646

47+
4748
# Capybara versions that support RSpec 3 only support RUBY_VERSION >= 1.9.3
4849
if RUBY_VERSION >= '1.9.3'
4950
if /5(\.|-)[1-9]\d*/ === RAILS_VERSION || "master" == RAILS_VERSION

Gemfile-rails-dependencies

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ when /stable$/
2222
gem_list << 'actionview' if version > '4-0-stable'
2323
if RUBY_VERSION >= "2.2"
2424
gem_list << 'puma' if version > '5-0-stable'
25-
elsif RUBY_VERSION >= "1.9.3"
26-
gem "puma", "~> 3.11.4"
2725
end
2826

2927
gem_list.each do |rails_gem|
@@ -42,12 +40,8 @@ when nil, false, ""
4240
else
4341
gem "rails", version
4442

45-
if version >= '5-1-stable'
46-
if RUBY_VERSION < "2.2"
47-
gem "puma", "~> 3.11.4"
48-
else
49-
gem "puma"
50-
end
43+
if version >= '5-1-stable' && RUBY_VERSION >= "2.2"
44+
gem "puma"
5145
end
5246
end
5347

0 commit comments

Comments
 (0)