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 /Gemfile.lock | |
| 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
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
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) |