kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Change references from ApplicationSetting to ::ApplicationSetting to make autoload happier

Browse source 
Closes #34047
This commit is contained in:
Stan Hu 2017-06-20 23:26:02 -07:00
parent b2e1d32e7a
commit 03e538b721
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/gitlab/current_settings.rb
View file

@ -10,7 +10,7 @@ module Gitlab
delegate :sidekiq_throttling_enabled?, to: :current_application_settings delegate :sidekiq_throttling_enabled?, to: :current_application_settings
def fake_application_settings(defaults = ApplicationSetting.defaults) def fake_application_settings(defaults = ::ApplicationSetting.defaults)
FakeApplicationSettings.new(defaults) FakeApplicationSettings.new(defaults)
end end
@ -24,7 +24,7 @@ module Gitlab
def cached_application_settings def cached_application_settings
begin begin
ApplicationSetting.cached ::ApplicationSetting.cached
rescue ::Redis::BaseError, ::Errno::ENOENT rescue ::Redis::BaseError, ::Errno::ENOENT
# In case Redis isn't running or the Redis UNIX socket file is not available # In case Redis isn't running or the Redis UNIX socket file is not available
end end
@ -35,7 +35,7 @@ module Gitlab
# This loads from the database into the cache, so handle Redis errors # This loads from the database into the cache, so handle Redis errors
begin begin
db_settings = ApplicationSetting.current db_settings = ::ApplicationSetting.current
rescue ::Redis::BaseError, ::Errno::ENOENT rescue ::Redis::BaseError, ::Errno::ENOENT
# In case Redis isn't running or the Redis UNIX socket file is not available # In case Redis isn't running or the Redis UNIX socket file is not available
end end
@ -45,14 +45,14 @@ module Gitlab
# and other callers from failing, use any loaded settings and return # and other callers from failing, use any loaded settings and return
# defaults for missing columns. # defaults for missing columns.
if ActiveRecord::Migrator.needs_migration? if ActiveRecord::Migrator.needs_migration?
defaults = ApplicationSetting.defaults defaults = ::ApplicationSetting.defaults
defaults.merge!(db_settings.attributes.symbolize_keys) if db_settings.present? defaults.merge!(db_settings.attributes.symbolize_keys) if db_settings.present?
return fake_application_settings(defaults) return fake_application_settings(defaults)
end end
return db_settings if db_settings.present? return db_settings if db_settings.present?
ApplicationSetting.create_from_defaults || in_memory_application_settings ::ApplicationSetting.create_from_defaults || in_memory_application_settings
end end
def in_memory_application_settings def in_memory_application_settings