diff options
| author | Jason Lee <huacnlee@gmail.com> | 2016-01-21 11:01:13 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-02-08 17:28:48 +0300 |
| commit | e4d276816ab688b1f2af6842e71fe6bfc3036739 (patch) | |
| tree | 4ed37fda5ffd3618e7aca05ba9f0d9706407b8cb /lib/gitlab/current_settings.rb | |
| parent | 9fdd605fd2e4550170e5ef088bec7c6d2585c4a5 (diff) | |
Fix CurrentSettings autoload bug in development.
Error: A copy of Gitlab::CurrentSettings has been removed from the module tree but is still active
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 8531c7e87e1..761b63e98f6 100644 --- a/lib/gitlab/current_settings.rb +++ b/lib/gitlab/current_settings.rb @@ -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 |