summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-05-16 17:11:59 +0200
committerRémy Coutable <remy@rymai.me>2018-05-23 16:14:43 +0200
commitd7ecdceb64ba10bac896422f09dd6307a18bf692 (patch)
tree3574c46116e1e98c738cb493d91df28b77a8930c
parent2bdf6edefa1b09338797f35943b0d61590386a63 (diff)
downloadgitlab-ce-d7ecdceb64ba10bac896422f09dd6307a18bf692.tar.gz
Don't expire the current ApplicationSetting in config/initializers/1_settings.rb
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r--config/initializers/1_settings.rb3
1 files changed, 0 insertions, 3 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 5248bd858a0..dd36700964a 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -470,6 +470,3 @@ if Rails.env.test?
Settings.gitlab['default_can_create_group'] = true
Settings.gitlab['default_can_create_team'] = false
end
-
-# Force a refresh of application settings at startup
-ApplicationSetting.expire