summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2016-10-11 22:21:33 +0000
committerStan Hu <stanhu@gmail.com>2016-10-11 22:21:33 +0000
commita0f9cff5e8244fac3290710e1cb7863ff1cb91bd (patch)
tree3fd7a3b06818ed389490003cded6e484a795b690
parenta4a9fdf1e7a61a5779d3f5cb8902f77cc2b4f472 (diff)
parentba99f0b45157e841550f87c1d4e6879e108d2d6c (diff)
downloadgitlab-ce-a0f9cff5e8244fac3290710e1cb7863ff1cb91bd.tar.gz
Merge branch 'sh-update-changelog' into 'master'
Add CHANGELOG entry for 8.12.6 See merge request !6816
-rw-r--r--CHANGELOG3
1 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 37cbfeff01a..c8271f55cfb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -100,6 +100,9 @@ v 8.13.0 (unreleased)
- API: all unknown routing will be handled with 404 Not Found
- Make guests unable to view MRs on private projects
+v 8.12.6
+ - Update mailroom to 0.8.1 in Gemfile.lock !6814
+
v 8.12.5
- Switch from request to env in ::API::Helpers. !6615
- Update the mail_room gem to 0.8.1 to fix a race condition with the mailbox watching thread. !6714