summaryrefslogtreecommitdiff
path: root/lib/current_settings.rb
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2015-09-14 15:33:56 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2015-09-18 14:14:52 +0200
commitfcd2bdf1fe83a4d39a6c3af6d03d09500f93ca4d (patch)
treef13008530f1e36a83e6e5d33236dd0461ef89ee4 /lib/current_settings.rb
parente3041b90dc4b02a1bd9b68e820d19f4a58488940 (diff)
downloadgitlab-ci-migrate-tables-to-ci-prefix.tar.gz
Revert some Make it work Migrate tags and taggings to
Diffstat (limited to 'lib/current_settings.rb')
-rw-r--r--lib/current_settings.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/current_settings.rb b/lib/current_settings.rb
index 59dedfd..a8c89d4 100644
--- a/lib/current_settings.rb
+++ b/lib/current_settings.rb
@@ -3,7 +3,7 @@ module CurrentSettings
key = :current_application_settings
RequestStore.store[key] ||= begin
- if ActiveRecord::Base.connected? && ActiveRecord::Base.connection.table_exists?('application_settings')
+ if ActiveRecord::Base.connected? && ActiveRecord::Base.connection.table_exists?('ci_application_settings')
ApplicationSetting.current || ApplicationSetting.create_from_defaults
else
fake_application_settings