Merge remote-tracking branch 'dev/12-5-stable' into 12-5-stable

5413c6cd · GitLab Release Tools Bot · ec764103 · 49482945 · 5413c6cd · 5413c6cd
Commit 5413c6cd authored Nov 27, 2019 by GitLab Release Tools Bot
Showing with 8 additions and 6 deletions

CHANGELOG.md CHANGELOG.md +7 -0

VERSION VERSION +1 -1

changelogs/unreleased/security-dos-issue-and-commit-comments-master.yml ...eleased/security-dos-issue-and-commit-comments-master.yml +0 -5

No files found.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.

+## 12.5.2
+
+### Security (1 change)
+
+- Fix 500 error caused by invalid byte sequences in links.
+
+
 ## 12.5.1

 ### Security (11 changes)

--- a/VERSION
+++ b/VERSION
-12.5.1-ee
+12.5.2
--- a/changelogs/unreleased/security-dos-issue-and-commit-comments-master.yml
+++ b/changelogs/unreleased/security-dos-issue-and-commit-comments-master.yml
---
-title: Fix 500 error caused by invalid byte sequences in links
-merge_request:
-author:
-type: security