diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-29 18:09:48 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-29 18:09:48 +0300 |
| commit | f4d51a9f71cf3d4b0874a3e1948fe3c1ea193c4d (patch) | |
| tree | 7ae3da76e824c435167dd108721c0124ad2ee484 /lib/gitlab/current_settings.rb | |
| parent | 2dedd78ef505a0ab0a379c7340a3fcba56ada663 (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 e7ffeeb9849..bfe3f06a56b 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.cached_table_exists?('application_settings') + Gitlab::Database.main.cached_table_exists?('application_settings') rescue ActiveRecord::NoDatabaseError false end |