diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-01-26 12:46:02 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-01-27 16:16:55 +0100 |
| commit | c446cfcbae82b4bfa2987ddf2b4865b11230ca1b (patch) | |
| tree | dc35089b8e0e2076a3547dd8a6415e4cce76cc9e /lib/gitlab/current_settings.rb | |
| parent | e745e1aae0880d65b9e9bd3f7b3aeb0bfce1613b (diff) | |
| download | gitlab-ce-c446cfcbae82b4bfa2987ddf2b4865b11230ca1b.tar.gz | |
Move ApplicationSetting DEFAULTS to `.defaults` instead
This will avoid autoloading issues in the long term.
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'lib/gitlab/current_settings.rb')
| -rw-r--r-- | lib/gitlab/current_settings.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb index 4ebd48a3fc7..e20f5f6f514 100644 --- a/lib/gitlab/current_settings.rb +++ b/lib/gitlab/current_settings.rb @@ -30,7 +30,7 @@ module Gitlab end def in_memory_application_settings - @in_memory_application_settings ||= ::ApplicationSetting.new(::ApplicationSetting::DEFAULTS) + @in_memory_application_settings ||= ::ApplicationSetting.new(::ApplicationSetting.defaults) # In case migrations the application_settings table is not created yet, # we fallback to a simple OpenStruct rescue ActiveRecord::StatementInvalid, ActiveRecord::UnknownAttributeError @@ -38,7 +38,7 @@ module Gitlab end def fake_application_settings - OpenStruct.new(::ApplicationSetting::DEFAULTS) + OpenStruct.new(::ApplicationSetting.defaults) end private |