diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-15 18:10:57 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-15 18:10:57 +0300 |
| commit | e5c7d631a84940c66e46f1824ba7ce0c7f1d0ea4 (patch) | |
| tree | ac1cce129d8c8cdcee6a668e27d8034d2da172e4 /lib/gitlab/current_settings.rb | |
| parent | 0687020509cafe1e24eb0bfa0e0f5c9f6c4799d2 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/current_settings.rb')
| -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 bfe3f06a56b..b9034cff447 100644 --- a/lib/gitlab/current_settings.rb +++ b/lib/gitlab/current_settings.rb @@ -85,7 +85,7 @@ module Gitlab active_db_connection = ActiveRecord::Base.connection.active? rescue false active_db_connection && - Gitlab::Database.main.cached_table_exists?('application_settings') + ApplicationSetting.database.cached_table_exists? rescue ActiveRecord::NoDatabaseError false end |