summaryrefslogtreecommitdiff
path: root/config/initializers/1_settings.rb
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-04-23 16:12:19 +0200
committerRémy Coutable <remy@rymai.me>2018-04-23 16:12:19 +0200
commit2afe3a1210e6c444f9b92d59a02fcb3f474ae614 (patch)
tree86034702043da254a0ad757e427f5c192e60750f /config/initializers/1_settings.rb
parent5b44097cf7a20a6bcdc38ac9ed43aac0ec33415e (diff)
downloadgitlab-ce-2afe3a1210e6c444f9b92d59a02fcb3f474ae614.tar.gz
Get rid of config/initializers/2_app.rb and define Gitlab in lib/gitlab.rb
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'config/initializers/1_settings.rb')
-rw-r--r--config/initializers/1_settings.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 53e3c50df5f..9b00ae459a3 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -1,5 +1,4 @@
require_dependency File.expand_path('../../lib/gitlab', __dir__) # Load Gitlab as soon as possible
-require_dependency File.expand_path('../../lib/settings', __dir__) # Load Settings as soon as possible
# Default settings
Settings['ldap'] ||= Settingslogic.new({})