Commit 6614e156 authored by GitLab Bot's avatar GitLab Bot

Add latest changes from gitlab-org/gitlab@13-12-stable-ee

parent ad6973cd
...@@ -526,22 +526,19 @@ ...@@ -526,22 +526,19 @@
.qa:rules:package-and-qa: .qa:rules:package-and-qa:
rules: rules:
- <<: *if-not-ee - <<: *if-not-ee
when: manual when: never
- <<: *if-dot-com-gitlab-org-and-security-merge-request - <<: *if-dot-com-gitlab-org-and-security-merge-request
changes: *ci-qa-patterns changes: *ci-qa-patterns
allow_failure: true allow_failure: true
when: manual
- <<: *if-dot-com-gitlab-org-and-security-merge-request - <<: *if-dot-com-gitlab-org-and-security-merge-request
changes: *qa-patterns changes: *qa-patterns
allow_failure: true allow_failure: true
when: manual
- <<: *if-dot-com-gitlab-org-and-security-merge-request - <<: *if-dot-com-gitlab-org-and-security-merge-request
changes: *code-patterns changes: *code-patterns
when: manual when: manual
allow_failure: true allow_failure: true
- <<: *if-dot-com-gitlab-org-schedule - <<: *if-dot-com-gitlab-org-schedule
allow_failure: true allow_failure: true
when: manual
############### ###############
# Rails rules # # Rails rules #
......
...@@ -2,6 +2,10 @@ ...@@ -2,6 +2,10 @@
documentation](doc/development/changelog.md) for instructions on adding your own documentation](doc/development/changelog.md) for instructions on adding your own
entry. entry.
## 13.12.15 (2021-11-03)
No changes.
## 13.12.14 (2021-11-03) ## 13.12.14 (2021-11-03)
### Fixed (2 changes) ### Fixed (2 changes)
......
13.12.14 13.12.15
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment