diff options
| author | blackst0ne <blackst0ne.ru@gmail.com> | 2018-03-22 09:37:57 +1100 |
|---|---|---|
| committer | blackst0ne <blackst0ne.ru@gmail.com> | 2018-03-22 09:37:57 +1100 |
| commit | 36bedfb7f37931a33d9af586296404c02c3ab80e (patch) | |
| tree | 9ca6e11053aea141c50030cb6e1de04c24b3432f /config/environment.rb | |
| parent | 5ae91f323d054341c0d012de85835ef40f1bf9f8 (diff) | |
| download | gitlab-ce-36bedfb7f37931a33d9af586296404c02c3ab80e.tar.gz | |
[Rails5] Update files by `rails app:update`blackst0ne-rails5-update-files-by-rails-app-update
Diffstat (limited to 'config/environment.rb')
| -rw-r--r-- | config/environment.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/config/environment.rb b/config/environment.rb index df3006d349c..487a4564b47 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -1,5 +1,11 @@ # Load the rails application -require File.expand_path('../application', __FILE__) + +# Remove this condition when upgraded to rails 5.0. +if %w[1 true].include?(ENV["RAILS5"]) + require_relative 'application' +else + require File.expand_path('../application', __FILE__) +end # Initialize the rails application Rails.application.initialize! |