diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-17 14:33:21 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-17 14:33:21 +0300 |
| commit | 7021455bd1ed7b125c55eb1b33c5a01f2bc55ee0 (patch) | |
| tree | 5bdc2229f5198d516781f8d24eace62fc7e589e9 /spec/lib/gitlab/database_spec.rb | |
| parent | 185b095e93520f96e9cfc31d9c3e69b498cdab7c (diff) | |
Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42
Diffstat (limited to 'spec/lib/gitlab/database_spec.rb')
| -rw-r--r-- | spec/lib/gitlab/database_spec.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/spec/lib/gitlab/database_spec.rb b/spec/lib/gitlab/database_spec.rb index eb42734d044..c788022bd3a 100644 --- a/spec/lib/gitlab/database_spec.rb +++ b/spec/lib/gitlab/database_spec.rb @@ -242,13 +242,9 @@ RSpec.describe Gitlab::Database do pool&.disconnect! end - context "when there's CI connection", :request_store do + context "when there's CI connection" do before do skip_if_multiple_databases_not_setup - - # FF due to lib/gitlab/database/load_balancing/configuration.rb:92 - # Requires usage of `:request_store` - stub_feature_flags(force_no_sharing_primary_model: true) end context 'when CI uses database_tasks: false does indicate that ci: is subset of main:' do |