diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-03-24 00:09:38 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-03-24 00:09:38 +0300 |
| commit | 391732a2c1b04baf565c77f2788a1ec035b1d85e (patch) | |
| tree | 13bc1f3169fb698dd298513822984a7aca526b97 /config/environment.rb | |
| parent | 93e216e6a5b3d3af08c054d662f8d361c812cecc (diff) | |
| parent | 36bedfb7f37931a33d9af586296404c02c3ab80e (diff) | |
Merge branch 'blackst0ne-rails5-update-files-by-rails-app-update' into 'master'
[Rails5] Update files by `rails app:update`
See merge request gitlab-org/gitlab-ce!17828
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! |