diff options
author | Stan Hu <stanhu@gmail.com> | 2017-01-21 03:37:04 +0300 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2017-01-21 03:37:04 +0300 |
commit | 8dbac708dcb34d3a0510e9ba65e64b9377c93d49 (patch) | |
tree | 37c78090c37584502c5a82c29c98fe3b70f42b46 /lib | |
parent | d6529dbb6af3fa671ce90f73fbc5a6d60fd469d5 (diff) |
Revert "Merge branch 'backport-fix-load-error' into 'master'"
This reverts merge request !8671
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/current_settings.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb index e20f5f6f514..c79e17b57ee 100644 --- a/lib/gitlab/current_settings.rb +++ b/lib/gitlab/current_settings.rb @@ -30,15 +30,15 @@ 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 + rescue ActiveRecord::StatementInvalid fake_application_settings end def fake_application_settings - OpenStruct.new(::ApplicationSetting.defaults) + OpenStruct.new(ApplicationSetting::DEFAULTS) end private |