summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-01-08 10:30:35 -0800
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-01-08 10:30:35 -0800
commit8133e44998236438c46e1b662bd284323287f415 (patch)
tree9521601b22e9653dc332f3357b0a63008dceecee /lib
parent57a65ede77b7bbae6e3b2a7aa52135de7b0c2f8e (diff)
downloadgitlab-ce-8133e44998236438c46e1b662bd284323287f415.tar.gz
Hack for migrating to new settings
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/current_settings.rb12
1 files changed, 11 insertions, 1 deletions
diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb
index 3467bb892fc..60efc70aa40 100644
--- a/lib/gitlab/current_settings.rb
+++ b/lib/gitlab/current_settings.rb
@@ -1,7 +1,17 @@
module Gitlab
module CurrentSettings
def current_application_settings
- ApplicationSetting.current
+ if ActiveRecord::Base.connection.table_exists?('application_settings')
+ ApplicationSetting.current
+ else
+ OpenStruct.new(
+ default_projects_limit: Settings.gitlab['default_projects_limit'],
+ signup_enabled: Settings.gitlab['signup_enabled'],
+ signin_enabled: Settings.gitlab['signin_enabled'],
+ gravatar_enabled: Settings.gravatar['enabled'],
+ sign_in_text: Settings.extra['sign_in_text'],
+ )
+ end
end
end
end