diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-01-26 12:45:14 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-01-27 16:16:55 +0100 |
| commit | e745e1aae0880d65b9e9bd3f7b3aeb0bfce1613b (patch) | |
| tree | a8e3d24f222ba1ffdca5d5283f3e5a802b486a63 /config/initializers | |
| parent | d777e6f1da98be64b872a2bea2222f3e037a3d4d (diff) | |
| download | gitlab-ce-e745e1aae0880d65b9e9bd3f7b3aeb0bfce1613b.tar.gz | |
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/initializers')
| -rw-r--r-- | config/initializers/1_settings.rb | 8 |
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 |