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

Bump mail_room to v0.8.1 to fix thread cleanup issue See https://github.com/tpitale/mail_room/blob/master/CHANGELOG.md Closes #20273 See merge request !6788

Merge branch 'sh-update-mailroom' into 'master'
9616f9b4 · Robert Speicher · 73adae0f · ac93758a · 9616f9b4 · 9616f9b4
Commit 9616f9b4 authored Oct 11, 2016 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

CHANGELOG CHANGELOG +1 -0

Gemfile.lock Gemfile.lock +1 -1

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date.

 v 8.13.0 (unreleased)
  - Truncate long labels with ellipsis in labels page
+  - Bump mail_room to v0.8.1 to fix thread cleanup issue
  - Update runner version only when updating contacted_at
  - Add link from system note to compare with previous version
  - Improve issue load time performance by avoiding ORDER BY in find_by call

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -399,7 +399,7 @@ GEM
      systemu (~> 2.6.2)
    mail (2.6.4)
      mime-types (>= 1.16, < 4)
-    mail_room (0.8.0)
+    mail_room (0.8.1)
    method_source (0.8.2)
    mime-types (2.99.3)
    mimemagic (0.3.0)