summaryrefslogtreecommitdiff
path: root/spec/support
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-09-08 15:09:10 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-09-08 15:09:10 +0000
commita74cb0526c088bf5868f5aba1aec949800c1d641 (patch)
treee30827d0d46a9b2f35fc86bb9deaa8876b362ba7 /spec/support
parente2f984e14e1fd34e5105669c4306388019e6b5b6 (diff)
downloadgitlab-ce-a74cb0526c088bf5868f5aba1aec949800c1d641.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/support')
-rw-r--r--spec/support/database/cross-join-allowlist.yml1
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 8d0331f2298..2bb41281746 100644
--- a/spec/support/database/cross-join-allowlist.yml
+++ b/spec/support/database/cross-join-allowlist.yml
@@ -381,7 +381,6 @@
- "./spec/views/projects/jobs/_build.html.haml_spec.rb"
- "./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/new_merge_request_worker_spec.rb"
- "./spec/workers/pipeline_process_worker_spec.rb"
- "./spec/workers/pipeline_schedule_worker_spec.rb"