diff options
| author | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2019-11-27 20:43:03 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2019-11-27 20:43:03 +0000 |
| commit | 5413c6cd4922f13ca384bb099c631622ac4e48f8 (patch) | |
| tree | 1656de4db6616c1bc5be4b47c99a97cd7e416e04 | |
| parent | ec764103ee252c84563851ccc53fb99eef88c742 (diff) | |
| parent | 49482945d28784af790db1c99da688d797c6fca7 (diff) | |
| download | gitlab-ce-5413c6cd4922f13ca384bb099c631622ac4e48f8.tar.gz | |
Merge remote-tracking branch 'dev/12-5-stable' into 12-5-stable
| -rw-r--r-- | CHANGELOG.md | 7 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/security-dos-issue-and-commit-comments-master.yml | 5 |
3 files changed, 8 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 9cef812464a..c2e333745f9 100644 --- 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) @@ -1 +1 @@ -12.5.1-ee +12.5.2 diff --git a/changelogs/unreleased/security-dos-issue-and-commit-comments-master.yml b/changelogs/unreleased/security-dos-issue-and-commit-comments-master.yml deleted file mode 100644 index c84cebdcca0..00000000000 --- a/changelogs/unreleased/security-dos-issue-and-commit-comments-master.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix 500 error caused by invalid byte sequences in links -merge_request: -author: -type: security |