Commit cb846067 authored by Rémy Coutable's avatar Rémy Coutable

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
Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 4ebf6f4d
......@@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date.
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
- Improve issue load time performance by avoiding ORDER BY in find_by call. !6724
v 8.12.4
......
......@@ -331,7 +331,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'
......
......@@ -894,7 +894,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)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment