diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-03 18:55:26 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-03 18:55:26 +0000 |
| commit | 6614e1562c6b7ca5e1b8c6992cb46a54f8d37dca (patch) | |
| tree | 28294189f98a6db804807181c06765fcc4e6af26 | |
| parent | ad6973cdfb469825ebac345b3a695e0dad268eba (diff) | |
| download | gitlab-ce-6614e1562c6b7ca5e1b8c6992cb46a54f8d37dca.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.15
| -rw-r--r-- | .gitlab/ci/rules.gitlab-ci.yml | 5 | ||||
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | GITALY_SERVER_VERSION | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 447ccf80e7c..5c9be5b1e9f 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -526,22 +526,19 @@ .qa:rules:package-and-qa: rules: - <<: *if-not-ee - when: manual + when: never - <<: *if-dot-com-gitlab-org-and-security-merge-request changes: *ci-qa-patterns allow_failure: true - when: manual - <<: *if-dot-com-gitlab-org-and-security-merge-request changes: *qa-patterns allow_failure: true - when: manual - <<: *if-dot-com-gitlab-org-and-security-merge-request changes: *code-patterns when: manual allow_failure: true - <<: *if-dot-com-gitlab-org-schedule allow_failure: true - when: manual ############### # Rails rules # diff --git a/CHANGELOG.md b/CHANGELOG.md index 59b7adc311c..b5fda7bb5c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 13.12.15 (2021-11-03) + +No changes. + ## 13.12.14 (2021-11-03) ### Fixed (2 changes) diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 5a2a99e59ac..89db36ccc6b 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -13.12.14
\ No newline at end of file +13.12.15
\ No newline at end of file |