summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRubén Dávila Santos <ruben@gitlab.com>2016-09-24 14:16:19 +0000
committerRubén Dávila Santos <ruben@gitlab.com>2016-09-24 14:16:19 +0000
commit6602b917f7ffcb8c8e9134ee156ac49c24ed2a9b (patch)
treefe50f9208cee711913669581111badb0912b0276
parent513629f3467a740231fa531637f3577c41f8d1bf (diff)
parent8e15ded107c4250669940b79903989e1a9f603fe (diff)
downloadgitlab-ce-6602b917f7ffcb8c8e9134ee156ac49c24ed2a9b.tar.gz
Merge branch 'update-changelog' into 'master'
Fix CHANGELOG. cc: @stanhu See merge request !6505
-rw-r--r--CHANGELOG5
1 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 1ebed18ebb4..592a3fec134 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,8 +3,11 @@ Please view this file on the master branch, on stable branches it's out of date.
v 8.13.0 (unreleased)
- Speed-up group milestones show page
-v 8.12.1 (unreleased)
+v 8.12.2 (unreleased)
+
+v 8.12.1
- Fix a memory leak in HTML::Pipeline::SanitizationFilter::WHITELIST
+ - Fix issue with search filter labels not displaying
v 8.12.0
- Update the rouge gem to 2.0.6, which adds highlighting support for JSX, Prometheus, and others. !6251