Commit e4d27681 authored by Jason Lee's avatar Jason Lee Committed by Rémy Coutable

Fix CurrentSettings autoload bug in development.

Error: A copy of Gitlab::CurrentSettings has been removed from the module tree but is still active
parent 9fdd605f
...@@ -7,8 +7,8 @@ module Gitlab ...@@ -7,8 +7,8 @@ module Gitlab
settings = nil settings = nil
if connect_to_db? if connect_to_db?
settings = ApplicationSetting.current settings = ::ApplicationSetting.current
settings ||= ApplicationSetting.create_from_defaults unless ActiveRecord::Migrator.needs_migration? settings ||= ::ApplicationSetting.create_from_defaults unless ActiveRecord::Migrator.needs_migration?
end end
settings || fake_application_settings settings || fake_application_settings
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment