Skip to content

Commit 814b377

Browse files
authored
Change minimum Ruby version for Puma to 2.2 + specify rdoc version under 2.2 (#2013)
Puma now requires Ruby 2.2 minimum See: https://github.com/puma/puma/pull/1506/files Also specify bundler version because of: rubygems/bundler#6629 Specific version should be removed when the issue is fixed on next release of bundler.
2 parents e3cad68 + c503989 commit 814b377

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ bundler_args: "--binstubs --path ../bundle --retry=3 --jobs=3"
2424

2525
before_install:
2626
- gem update --system
27-
- gem install bundler
27+
- gem install bundler -v 1.16.2
2828
- script/clone_all_rspec_repos
2929

3030
before_script:

Gemfile-rails-dependencies

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ when /master/
1313
gem 'i18n', :git => 'git://github.com/svenfuchs/i18n.git', :branch => 'master'
1414
gem 'sprockets', :git => 'git://github.com/rails/sprockets.git', :branch => 'master'
1515
gem 'sprockets-rails', :git => 'git://github.com/rails/sprockets-rails.git', :branch => 'master'
16-
if RUBY_VERSION >= "1.9.3"
16+
if RUBY_VERSION >= "2.2"
1717
gem 'puma', :git => 'git://github.com/puma/puma', :branch => 'master'
1818
end
1919
when /stable$/
2020
gem_list = %w[rails railties actionmailer actionpack activerecord activesupport]
2121
gem_list << 'activejob' if version > '4-1-stable'
2222
gem_list << 'actionview' if version > '4-0-stable'
23-
if RUBY_VERSION >= "1.9.3"
23+
if RUBY_VERSION >= "2.2"
2424
gem_list << 'puma' if version > '5-0-stable'
2525
end
2626

@@ -40,7 +40,7 @@ when nil, false, ""
4040
else
4141
gem "rails", version
4242

43-
if version >= '5-1-stable' && RUBY_VERSION >= "1.9.3"
43+
if version >= '5-1-stable' && RUBY_VERSION >= "2.2"
4444
gem "puma"
4545
end
4646
end

0 commit comments

Comments
 (0)