diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-10-11 11:40:10 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-10-11 11:40:10 +0000 |
| commit | 755c873265024a6a2ed30daca6c5a10c3feadb10 (patch) | |
| tree | 9cf4d5dbc3462719610d613bfd02c4209798b8d4 | |
| parent | 455714ccc912f11536f4022179a37fa00e307a4c (diff) | |
| parent | 90f49cc6969ec522457ddce8e864169f5c91e6aa (diff) | |
| download | gitlab-ce-755c873265024a6a2ed30daca6c5a10c3feadb10.tar.gz | |
Merge branch 'master' into 'master'
Update mail_room gem
## What does this MR do?
Upgrades the mail_room gem from 0.8.0 to 0.8.1.
## Why was this MR needed?
mail_room throws an exception if the watching script joins a undefined thread. Release 0.8.1 adds a check to ensure that the thread exists before calling join.
Fixes gitlab-org/omnibus-gitlab#1619.
See merge request !6714
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index 4abdd4ebb7e..05d6d6118a1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -93,6 +93,7 @@ v 8.13.0 (unreleased) - API: all unknown routing will be handled with 404 Not Found v 8.12.5 (unreleased) + - Update the mail_room gem to 0.8.1 to fix a race condition with the mailbox watching thread v 8.12.4 - Fix "Copy to clipboard" tooltip to say "Copied!" when clipboard button is clicked. !6294 (lukehowell) @@ -324,7 +324,7 @@ gem 'newrelic_rpm', '~> 3.16' gem 'octokit', '~> 4.3.0' -gem 'mail_room', '~> 0.8' +gem 'mail_room', '~> 0.8.1' gem 'email_reply_parser', '~> 0.5.8' diff --git a/Gemfile.lock b/Gemfile.lock index ccab330993a..2feec4c4eb5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -889,7 +889,7 @@ DEPENDENCIES license_finder (~> 2.1.0) licensee (~> 8.0.0) loofah (~> 2.0.3) - mail_room (~> 0.8) + mail_room (~> 0.8.1) method_source (~> 0.8) minitest (~> 5.7.0) mousetrap-rails (~> 1.4.6) |