diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-06 09:11:02 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-06 09:11:02 +0000 |
commit | aea64c367b180ea549aa115d8312b7c1832bc0b3 (patch) | |
tree | 31380951356b27ac47cc401f3fef2d4e59782c16 /spec/support | |
parent | 578fc865330cb9ce65746ea5c03e993348e62c96 (diff) | |
download | gitlab-ce-aea64c367b180ea549aa115d8312b7c1832bc0b3.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/support')
-rw-r--r-- | spec/support/database/cross-join-allowlist.yml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/spec/support/database/cross-join-allowlist.yml b/spec/support/database/cross-join-allowlist.yml index 3d8316619d5..2db845801d2 100644 --- a/spec/support/database/cross-join-allowlist.yml +++ b/spec/support/database/cross-join-allowlist.yml @@ -386,7 +386,6 @@ - "./spec/workers/ci/drop_pipeline_worker_spec.rb" - "./spec/workers/ci/initial_pipeline_process_worker_spec.rb" - "./spec/workers/expire_job_cache_worker_spec.rb" -- "./spec/workers/expire_pipeline_cache_worker_spec.rb" - "./spec/workers/new_merge_request_worker_spec.rb" - "./spec/workers/pipeline_process_worker_spec.rb" - "./spec/workers/pipeline_schedule_worker_spec.rb" |