diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-03 15:19:46 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-03 15:19:46 +0000 |
commit | a62ab2083bbcdb64e6b86712332063b3cd9f58e0 (patch) | |
tree | c154b1acab92ab7544be16482791c68a1f5b783d | |
parent | 842b91c12fea51da36a91dc38cf72e4658a03ba4 (diff) | |
download | gitlab-ce-a62ab2083bbcdb64e6b86712332063b3cd9f58e0.tar.gz |
Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.14
-rw-r--r-- | CHANGELOG.md | 7 | ||||
-rw-r--r-- | GITALY_SERVER_VERSION | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 50a330449ae..59b7adc311c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 13.12.14 (2021-11-03) + +### Fixed (2 changes) + +- [Allow nil for remaining ci cd settings](gitlab-org/gitlab@896fd7ecf23714fa9f710efa4af245a26c677dce) ([merge request](gitlab-org/gitlab!73522)) +- [Allow nil on delegated CI/CD settings](gitlab-org/gitlab@d57a9ea79080fc473eb54c0ee696a50fd270e8a4) ([merge request](gitlab-org/gitlab!73522)) + ## 13.12.13 (2021-10-29) No changes. diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 060cc639933..5a2a99e59ac 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -13.12.13
\ No newline at end of file +13.12.14
\ No newline at end of file |