diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-11-17 15:27:16 +0300 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-11-17 20:01:53 +0300 |
| commit | 9ac0c76b78cd04b2505924f003dd720a0f155959 (patch) | |
| tree | 67af1f0be0b9d6b5fc42b27c5afe5516e2c7574c /lib/gitlab/current_settings.rb | |
| parent | 0af35d7e30e373b885bfddb30b14718d72d75ab0 (diff) | |
Use StrongMemoize and enable/disable cops properly
Diffstat (limited to 'lib/gitlab/current_settings.rb')
| -rw-r--r-- | lib/gitlab/current_settings.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb index 4e0dadcc3c7..dfb2cfe42b7 100644 --- a/lib/gitlab/current_settings.rb +++ b/lib/gitlab/current_settings.rb @@ -52,9 +52,8 @@ module Gitlab ::ApplicationSetting.create_from_defaults || in_memory_application_settings end - # rubocop:disable Cop/ModuleWithInstanceVariables def in_memory_application_settings - @in_memory_application_settings ||= ::ApplicationSetting.new(::ApplicationSetting.defaults) + @in_memory_application_settings ||= ::ApplicationSetting.new(::ApplicationSetting.defaults) # rubocop:disable Cop/ModuleWithInstanceVariables rescue ActiveRecord::StatementInvalid, ActiveRecord::UnknownAttributeError # In case migrations the application_settings table is not created yet, # we fallback to a simple OpenStruct |