diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-10-11 09:05:28 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-10-11 09:05:28 +0000 |
| commit | 9616f9b441ee5422517798a02bcd93c210b596ec (patch) | |
| tree | 1ba34f7df456ddf43cd8d077e4392c22ffae1d1c | |
| parent | 73adae0f62a3d6048abbee9d076e077185370325 (diff) | |
| parent | ac93758a25e307573dcf79a76318f5b45aec5d07 (diff) | |
| download | gitlab-ce-9616f9b441ee5422517798a02bcd93c210b596ec.tar.gz | |
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
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | Gemfile.lock | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 06af4e4d6f4..22a96d8cbd5 100644 --- 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 diff --git a/Gemfile.lock b/Gemfile.lock index b98c3acf948..ccab330993a 100644 --- 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) |