diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-22 09:09:46 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-22 09:09:46 +0300 |
| commit | 8e3f09c43583788e68c593c406e3de6bb443f8a6 (patch) | |
| tree | 49aaab4ddd46a391f3411affbd19d7bd241e960e /.gitlab/ci | |
| parent | 7999a6924ebc5af2f7d1f15a63cdd8c02fa67151 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab/ci')
| -rw-r--r-- | .gitlab/ci/rules.gitlab-ci.yml | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 271db50302f..b9e18d3f15e 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -574,6 +574,8 @@ when: never - <<: *if-jh when: never + - <<: *if-security-merge-request + when: never - <<: *if-merge-request-labels-as-if-jh - <<: *if-merge-request-labels-run-all-rspec - changes: *code-backstage-qa-patterns @@ -606,7 +608,7 @@ - <<: *if-jh when: never - <<: *if-security-merge-request - changes: *code-backstage-patterns + when: never - <<: *if-merge-request-labels-as-if-jh - <<: *if-merge-request-labels-run-all-rspec - <<: *if-merge-request @@ -1247,8 +1249,7 @@ - <<: *if-jh when: never - <<: *if-security-merge-request - changes: *code-backstage-patterns - allow_failure: true + when: never - <<: *if-merge-request-labels-as-if-jh allow_failure: true - <<: *if-merge-request @@ -1690,6 +1691,8 @@ when: never - <<: *if-jh when: never + - <<: *if-security-merge-request + when: never - <<: *if-merge-request-labels-as-if-jh - <<: *if-merge-request-labels-run-all-rspec - changes: *code-backstage-qa-patterns |