From e4d276816ab688b1f2af6842e71fe6bfc3036739 Mon Sep 17 00:00:00 2001 From: Jason Lee Date: Thu, 21 Jan 2016 16:01:13 +0800 Subject: [PATCH] Fix CurrentSettings autoload bug in development. Error: A copy of Gitlab::CurrentSettings has been removed from the module tree but is still active --- lib/gitlab/current_settings.rb | 4 ++-- 1 file 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