summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-05-25 22:30:00 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-05-25 22:30:00 +0000
commitbec931306a784792a7a1faa44e0db338fa34b3ee (patch)
tree0891c41dc4e4836aea6c878cf70d71965c00c695
parentdb4e9285043e7918c6566ab8143b5fbfcc19f77f (diff)
downloadgitlab-ce-bec931306a784792a7a1faa44e0db338fa34b3ee.tar.gz
Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.1
-rw-r--r--CHANGELOG.md8
-rw-r--r--GITALY_SERVER_VERSION2
2 files changed, 9 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 21d1f152695..669dec87484 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 13.12.1 (2021-05-25)
+
+### Fixed (3 changes)
+
+- [Merge branch 'fix/pin-gke-version-to-1-18' into 'master'](gitlab-org/gitlab@44de5542ca82b371ed280db9ce03e0c4d4bd6135) ([merge request](gitlab-org/gitlab!62466))
+- [Merge branch '331562-fix-pipeline-security-tab-scanner-filter' into 'master'](gitlab-org/gitlab@1d70bf2efd574537d73b5fd80f92fd8dd939980b) ([merge request](gitlab-org/gitlab!62466))
+- [Update Gitaly's binary path in init.d scripts](gitlab-org/gitlab@0761e78434dbfa120c8ae14263bfe77f9ae48c71) ([merge request](gitlab-org/gitlab!62457))
+
## 13.12.0 (2021-05-22)
### Security (3 changes)
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index 5ce59df24cf..1e66d67b1b7 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-13.12.0 \ No newline at end of file
+13.12.1 \ No newline at end of file