Merge branch 'sh-update-changelog' into 'master'

Add CHANGELOG entry for 8.12.6 See merge request !6816

Merge branch 'sh-update-changelog' into 'master'
Add CHANGELOG entry for 8.12.6 See merge request !6816
a0f9cff5 · Stan Hu · a4a9fdf1 · ba99f0b4 · a0f9cff5
Commit a0f9cff5 authored Oct 11, 2016 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

CHANGELOG CHANGELOG +3 -0

No files found.
--- 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