mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-21 18:46:10 +10:00
Fix CurrentSettings autoload bug in development.
Error: A copy of Gitlab::CurrentSettings has been removed from the module tree but is still active
This commit is contained in:
@@ -7,8 +7,8 @@ module Gitlab
|
||||
settings = nil
|
||||
|
||||
if connect_to_db?
|
||||
settings = ApplicationSetting.current
|
||||
settings ||= ApplicationSetting.create_from_defaults unless ActiveRecord::Migrator.needs_migration?
|
||||
settings = ::ApplicationSetting.current
|
||||
settings ||= ::ApplicationSetting.create_from_defaults unless ActiveRecord::Migrator.needs_migration?
|
||||
end
|
||||
|
||||
settings || fake_application_settings
|
||||
|
||||
Reference in New Issue
Block a user