diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-02 21:10:52 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-02 21:10:52 +0300 |
commit | 7247395411759f832211b36f70dead50df3ea28b (patch) | |
tree | 8eb89db878d679377a1efbe36bafd1a1074be07a /spec/lib | |
parent | bea3a92105825c1fcef145727ba87bee3e31daee (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib')
-rw-r--r-- | spec/lib/gitlab/database/connection_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/database/connection_spec.rb b/spec/lib/gitlab/database/connection_spec.rb index f6ecc7761d6..905f2a419ac 100644 --- a/spec/lib/gitlab/database/connection_spec.rb +++ b/spec/lib/gitlab/database/connection_spec.rb @@ -143,7 +143,7 @@ RSpec.describe Gitlab::Database::Connection do describe '#disable_prepared_statements' do around do |example| - original_config = ::Gitlab::Database.main.config + original_config = connection.scope.connection.pool.db_config example.run |