diff options
| author | Eric Maziade <eric@spoutnik.co> | 2015-08-26 22:28:24 -0400 |
|---|---|---|
| committer | Eric Maziade <eric@spoutnik.co> | 2015-08-27 21:21:31 -0400 |
| commit | 23aee0ca8ad3de5697f770696f3e55fbfdba2be8 (patch) | |
| tree | 416a4ed702fc98c7dbe8fba7b0af3989a47b76c1 /lib/gitlab | |
| parent | de3b7d9c522db8d129a64f2b86297cf90413cb1e (diff) | |
| download | gitlab-ce-23aee0ca8ad3de5697f770696f3e55fbfdba2be8.tar.gz | |
fixed connection detection so settings can be read from the database
Diffstat (limited to 'lib/gitlab')
| -rw-r--r-- | lib/gitlab/current_settings.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb index 1a2a50a14d0..7ad3ed8728f 100644 --- a/lib/gitlab/current_settings.rb +++ b/lib/gitlab/current_settings.rb @@ -4,7 +4,7 @@ module Gitlab key = :current_application_settings RequestStore.store[key] ||= begin - if ActiveRecord::Base.connected? && ActiveRecord::Base.connection.table_exists?('application_settings') + if ActiveRecord::Base.connection.active? && ActiveRecord::Base.connection.table_exists?('application_settings') ApplicationSetting.current || ApplicationSetting.create_from_defaults else fake_application_settings |