diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-05-23 16:53:29 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-05-23 16:53:29 +0000 |
| commit | ddc760a0d625706196629c061f9dfa1cd2d8402e (patch) | |
| tree | b5ff46dd3bf269da913e3fcc60018753233b03c2 /config | |
| parent | 610aefe43440a7eae8e317aa0a2ed43f0437db98 (diff) | |
| parent | d7ecdceb64ba10bac896422f09dd6307a18bf692 (diff) | |
| download | gitlab-ce-ddc760a0d625706196629c061f9dfa1cd2d8402e.tar.gz | |
Merge branch '45175-cache-json-instead-of-activerecord-objects-in-appearance-and-applicationsetting' into 'master'
Resolve "Cache JSON instead of ActiveRecord objects in `Appearance` and `ApplicationSetting`"
Closes #45175
See merge request gitlab-org/gitlab-ce!18754
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/1_settings.rb | 3 |
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 |