Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-01-26 14:45:14 +0300
committerRémy Coutable <remy@rymai.me>2017-01-27 18:16:55 +0300
commite745e1aae0880d65b9e9bd3f7b3aeb0bfce1613b (patch)
treea8e3d24f222ba1ffdca5d5283f3e5a802b486a63 /config
parentd777e6f1da98be64b872a2bea2222f3e037a3d4d (diff)
Move a begin/rescue clause to ApplicationSetting.expire
Also, remove non-existing Ci::ApplicationSetting.expire! Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'config')
-rw-r--r--config/initializers/1_settings.rb8
1 files changed, 1 insertions, 7 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 906ec11f012..4f33aad8693 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -419,10 +419,4 @@ if Rails.env.test?
end
# Force a refresh of application settings at startup
-begin
- ApplicationSetting.expire
- Ci::ApplicationSetting.expire
-rescue
- # Gracefully handle when Redis is not available. For example,
- # omnibus may fail here during assets:precompile.
-end
+ApplicationSetting.expire