diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-16 18:09:09 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-16 18:09:09 +0000 |
| commit | b6b701cf9d08253d7c6f1e7500a09b1e373e18e3 (patch) | |
| tree | 72da94c08ae78c7c7be1d9c1c362a894b10a0efb /.gitlab/ci/rules.gitlab-ci.yml | |
| parent | 0e1756ac5c275f8d548c06693b15578baf189d56 (diff) | |
| download | gitlab-ce-b6b701cf9d08253d7c6f1e7500a09b1e373e18e3.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab/ci/rules.gitlab-ci.yml')
| -rw-r--r-- | .gitlab/ci/rules.gitlab-ci.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 8fcea840cfe..8a730970d9e 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -884,7 +884,8 @@ changes: *ci-build-images-patterns - <<: *if-default-refs changes: *code-qa-patterns - # Rules to support .qa:rules:package-and-test-ee + # Rules to support .qa:rules:package-and-test + - <<: *if-default-branch-schedule-nightly - <<: *if-merge-request changes: *dependency-patterns - <<: *if-merge-request-labels-run-all-e2e @@ -902,8 +903,6 @@ rules: - <<: *if-not-ee when: never - - <<: *if-merge-request-labels-pipeline-expedite - when: never - !reference [".build-images:rules:build-assets-image", "rules"] ################# @@ -1076,6 +1075,7 @@ - <<: *if-merge-request-labels-run-all-e2e - <<: *if-auto-deploy-branches - <<: *if-ruby2-branch + - <<: *if-default-branch-schedule-nightly - <<: *if-default-refs changes: *ci-build-images-patterns - <<: *if-default-refs |