summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarin Jankovski <marin@gitlab.com>2019-08-16 09:59:30 +0000
committerMarin Jankovski <marin@gitlab.com>2019-08-16 09:59:30 +0000
commit4a6d22ba439cb20937669c4aa2046acffb36a60e (patch)
treef77b5b54e2dd9d9e86ffabfc5abad1e7b9be21e4
parent4016bcac51d6dc9c24eeae6688bf3a72820ca719 (diff)
parent0572cb1d4254f07058f0ba80210e5a1c4431d872 (diff)
downloadgitlab-ce-4a6d22ba439cb20937669c4aa2046acffb36a60e.tar.gz
Merge branch 'jts/update-changelog' into '12-1-stable'
Updates changlog to reflect appropriate version release See merge request gitlab/gitlabhq!3320
-rw-r--r--CHANGELOG.md7
1 files changed, 3 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6ea61b09720..c550eccd5fc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,15 +4,14 @@ entry.
## 12.1.6
-- No changes.
-
-## 12.1.5
-
### Security (2 changes)
- Upgrade Gitaly to 1.53.2 to prevent revision flag injection exploits.
- Upgrade pages to 1.7.1 to prevent gitlab api token recovery from cookie.
+## 12.1.5
+
+- No changes.
## 12.1.4