diff options
| author | Jan Provaznik <jprovaznik@gitlab.com> | 2018-08-22 15:09:28 +0300 |
|---|---|---|
| committer | Jan Provaznik <jprovaznik@gitlab.com> | 2018-11-14 14:38:30 +0300 |
| commit | 547dc7ac600d3a8dfe61035fc35e82d11bea4aee (patch) | |
| tree | 232d1a27c9f716ac4c17277ae542d7ccd3ff3ee9 /config/boot.rb | |
| parent | c93439605bdad009754be70007c798b3d345e677 (diff) | |
Switch to Rails 5 by default
* updates Gemfile
* uses Rails 5 unless explicitly disabled
Diffstat (limited to 'config/boot.rb')
| -rw-r--r-- | config/boot.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/boot.rb b/config/boot.rb index 655c54ddb84..1aeacdabbad 100644 --- a/config/boot.rb +++ b/config/boot.rb @@ -1,10 +1,10 @@ def rails5? - %w[1 true].include?(ENV["RAILS5"]) + !%w[0 false].include?(ENV["RAILS5"]) end require 'rubygems' unless rails5? -gemfile = rails5? ? "Gemfile.rails5" : "Gemfile" +gemfile = rails5? ? "Gemfile" : "Gemfile.rails4" ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../#{gemfile}", __dir__) # Set up gems listed in the Gemfile. |