diff options
| author | Jan Provaznik <jprovaznik@gitlab.com> | 2018-08-22 14:09:28 +0200 |
|---|---|---|
| committer | Jan Provaznik <jprovaznik@gitlab.com> | 2018-11-14 12:38:30 +0100 |
| commit | 547dc7ac600d3a8dfe61035fc35e82d11bea4aee (patch) | |
| tree | 232d1a27c9f716ac4c17277ae542d7ccd3ff3ee9 /config/environment.rb | |
| parent | c93439605bdad009754be70007c798b3d345e677 (diff) | |
| download | gitlab-ce-547dc7ac600d3a8dfe61035fc35e82d11bea4aee.tar.gz | |
Switch to Rails 5 by default
* updates Gemfile
* uses Rails 5 unless explicitly disabled
Diffstat (limited to 'config/environment.rb')
| -rw-r--r-- | config/environment.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/environment.rb b/config/environment.rb index 5d35937f7c6..3a52656a2c1 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -1,10 +1,10 @@ # Load the rails application # Remove this condition when upgraded to rails 5.0. -if %w[1 true].include?(ENV["RAILS5"]) - require_relative 'application' -else +if %w[0 false].include?(ENV["RAILS5"]) require File.expand_path('application', __dir__) +else + require_relative 'application' end # Initialize the rails application |