diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-12-28 14:52:43 -0600 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-12-28 14:52:43 -0600 |
| commit | c9d7514fd8d46b0de126fb9d6d081ec25bd3c5bb (patch) | |
| tree | 417386f11b8c9f44bfac861659603281d302f614 /config/environment.rb | |
| parent | 77e1a9b0f8757109ca7f7a4398c46fe8d1d45dbe (diff) | |
| parent | e962baf4417e59cbb2ef8621ef0662f93f180f92 (diff) | |
| download | gitlab-ce-fix-popover-header-size.tar.gz | |
Merge branch 'master' into fix-popover-header-sizefix-popover-header-size
Diffstat (limited to 'config/environment.rb')
| -rw-r--r-- | config/environment.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/config/environment.rb b/config/environment.rb index 3a52656a2c1..7e55c7803d3 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -1,11 +1,6 @@ # Load the rails application -# Remove this condition when upgraded to rails 5.0. -if %w[0 false].include?(ENV["RAILS5"]) - require File.expand_path('application', __dir__) -else - require_relative 'application' -end +require_relative 'application' # Initialize the rails application Rails.application.initialize! |