summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-08-16 11:25:26 +0000
committerRémy Coutable <remy@rymai.me>2017-08-16 11:25:26 +0000
commitfcce6c3168dbd04404f318b4e983d7395d21538c (patch)
treed8155d729f0915f6117bbe1f4010fffec9d37e56 /config
parent9ac2a517798af2f942b28138403690afc20a254c (diff)
parent260c8da060a6039cbd47cfe31c8ec6d6f9b43de0 (diff)
downloadgitlab-ce-fcce6c3168dbd04404f318b4e983d7395d21538c.tar.gz
Merge branch 'rs-more-public-send-whitelists' into 'master'
Whitelist or fix additional `Gitlab/PublicSend` cop violations See merge request !13467
Diffstat (limited to 'config')
-rw-r--r--config/initializers/1_settings.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 5c6578d3531..38ade18bdc0 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -1,3 +1,5 @@
+# rubocop:disable GitlabSecurity/PublicSend
+
require_dependency Rails.root.join('lib/gitlab') # Load Gitlab as soon as possible
class Settings < Settingslogic