Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change minimum Ruby version for Puma to 2.2 + specify rdoc version under 2.2 #2013

Merged
merged 8 commits into from
Jul 20, 2018
Merged

Change minimum Ruby version for Puma to 2.2 + specify rdoc version under 2.2 #2013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8d2b95c
Change minimum Ruby version for Puma to 2.2
benoittgt Jul 15, 2018
0d4547b
Specify rdoc version when Ruby version is under 2.2
benoittgt Jul 15, 2018
1a47885
Use generated Gemfile to store rdoc specific requirement for Ruby 2.2
benoittgt Jul 18, 2018
d920c30
Permit usage of puma 3.11.4 between Ruby 1.9.3 and 2.2
benoittgt Jul 18, 2018
00a254e
Specify rdoc version when Ruby version is under 2.2 on generated_app
benoittgt Jul 20, 2018
ae334b5
Clear conflicts and rewrite puma clause
benoittgt Jul 20, 2018
65d85a3
Revert to initial changes
benoittgt Jul 20, 2018
c503989
Avoid bundler load error on CI
benoittgt Jul 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ bundler_args: "--binstubs --path ../bundle --retry=3 --jobs=3"

before_install:
- gem update --system
- gem install bundler
- gem install bundler -v 1.16.2
- script/clone_all_rspec_repos

before_script:
Expand Down
6 changes: 3 additions & 3 deletions Gemfile-rails-dependencies
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ when /master/
gem 'i18n', :git => 'git://github.com/svenfuchs/i18n.git', :branch => 'master'
gem 'sprockets', :git => 'git://github.com/rails/sprockets.git', :branch => 'master'
gem 'sprockets-rails', :git => 'git://github.com/rails/sprockets-rails.git', :branch => 'master'
if RUBY_VERSION >= "1.9.3"
if RUBY_VERSION >= "2.2"
gem 'puma', :git => 'git://github.com/puma/puma', :branch => 'master'
end
when /stable$/
gem_list = %w[rails railties actionmailer actionpack activerecord activesupport]
gem_list << 'activejob' if version > '4-1-stable'
gem_list << 'actionview' if version > '4-0-stable'
if RUBY_VERSION >= "1.9.3"
if RUBY_VERSION >= "2.2"
Copy link
Member

@JonRowe JonRowe Jul 17, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So we'd normally do a gate here, install an older version of puma on platforms that support it, and install the latest on Ruby 2.2, this is necessary to support older rubies.

gem_list << 'puma' if version > '5-0-stable'
end

Expand All @@ -40,7 +40,7 @@ when nil, false, ""
else
gem "rails", version

if version >= '5-1-stable' && RUBY_VERSION >= "1.9.3"
if version >= '5-1-stable' && RUBY_VERSION >= "2.2"
Copy link
Member

@JonRowe JonRowe Jul 17, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As above.

gem "puma"
end
end
Expand Down