diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-12 00:08:18 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-12 00:08:18 +0300 |
commit | d5012fff67191be53070d024a89195a666a581ed (patch) | |
tree | 08d4334c0202f365a5513dd2147d5a411fe05bcb /.gitlab | |
parent | 1a2f754734eb189e371e25e685413808f69a7f2c (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
-rw-r--r-- | .gitlab/ci/rules.gitlab-ci.yml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index ab5c56214be..82bd941f409 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -871,8 +871,6 @@ .build-images:rules:build-assets-image-as-if-foss: rules: - - <<: *if-not-canonical-namespace - when: never - <<: *if-not-ee when: never - <<: *if-merge-request-labels-pipeline-expedite @@ -1371,6 +1369,11 @@ - <<: *if-merge-request-labels-pipeline-expedite when: never - <<: *if-dot-com-gitlab-org-and-security-merge-request + changes: *ci-build-images-patterns + when: manual + allow_failure: true + - <<: *if-dot-com-gitlab-org-and-security-merge-request + changes: *code-qa-patterns when: manual allow_failure: true |