summaryrefslogtreecommitdiff
path: root/config/environment.rb
diff options
context:
space:
mode:
authorJasper Maes <jaspermaes.jm@gmail.com>2018-12-07 19:15:06 +0100
committerJasper Maes <jaspermaes.jm@gmail.com>2018-12-14 19:36:22 +0100
commit44fef4fe4cb9d4f30f129ff5a548395bc924c8fe (patch)
treeac5e97a16658edfb25b8407f1cf2d9a11c172667 /config/environment.rb
parenteafc8e2f481751b973260287c844b70bd408dcb2 (diff)
downloadgitlab-ce-44fef4fe4cb9d4f30f129ff5a548395bc924c8fe.tar.gz
Remove rails 4 support in CI, Gemfiles, bin/ and config/
Diffstat (limited to 'config/environment.rb')
-rw-r--r--config/environment.rb7
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!