summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-11-05 17:46:04 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-11-05 17:46:04 +0000
commitdef69dde9f1ba7863ad78feab5c6d8fffd94340a (patch)
treeded740fcdb06880996c16256c84adde738386a10
parent3f7d43665e40ba907f3626d9ee88b6696431b8e9 (diff)
downloadgitlab-ce-14-0-stable.tar.gz
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.1214-0-stable
-rw-r--r--CHANGELOG.md9
-rw-r--r--GITALY_SERVER_VERSION2
2 files changed, 10 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5562eb124f8..737a7f48796 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,15 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 14.0.12 (2021-11-05)
+
+### Changed (4 changes)
+
+- [Geo: Alternate redownload and normal design sync attempts](gitlab-org/gitlab@ed34172e5c7425316480efb732a9429e93e81017) ([merge request](gitlab-org/gitlab!73722)) **GitLab Enterprise Edition**
+- [Geo: Alternate redownload and normal SSF sync attempts](gitlab-org/gitlab@c0f2f40b98c4b9fc72c21c474a2224e045263ea2) ([merge request](gitlab-org/gitlab!73722)) **GitLab Enterprise Edition**
+- [Geo: Alternate redownload and normal project syncs](gitlab-org/gitlab@6370a7258719d5eb0ad83c54383ecb7f4fd54fc2) ([merge request](gitlab-org/gitlab!73722)) **GitLab Enterprise Edition**
+- [Geo: Reduce frequency of redownload attempts](gitlab-org/gitlab@1bcd41f28733b01286a42689857f6530c0805186) ([merge request](gitlab-org/gitlab!73722)) **GitLab Enterprise Edition**
+
## 14.0.11 (2021-09-23)
### Fixed (1 change)
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index 6bd31873616..c8594915860 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-14.0.11 \ No newline at end of file
+14.0.12 \ No newline at end of file