summaryrefslogtreecommitdiff
path: root/lib/gitlab.rb
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-04-25 08:03:58 +0000
committerRémy Coutable <remy@rymai.me>2018-04-25 08:03:58 +0000
commit772b6b08dd7c97c8c145a57f524d60aaefc4eaef (patch)
treec7d183961d8bff3046737453dee95017cffbfbe2 /lib/gitlab.rb
parentab7b01aa30a20de547a133931318964dcd032f6b (diff)
parent575302c1b94984cc8e96e71b8ab606e69283ec67 (diff)
downloadgitlab-ce-772b6b08dd7c97c8c145a57f524d60aaefc4eaef.tar.gz
Merge branch 'fix-settings-preloading' into 'master'
Do not preload settings See merge request gitlab-org/gitlab-ce!18566
Diffstat (limited to 'lib/gitlab.rb')
-rw-r--r--lib/gitlab.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/gitlab.rb b/lib/gitlab.rb
index 0a167104bf4..9c9368a4f8d 100644
--- a/lib/gitlab.rb
+++ b/lib/gitlab.rb
@@ -1,4 +1,3 @@
-require_dependency 'settings'
require_dependency 'gitlab/popen'
module Gitlab