summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTjaart van der Walt <git@tjaart.co.za>2016-10-06 11:53:53 -0500
committerTjaart van der Walt <git@tjaart.co.za>2016-10-06 11:53:53 -0500
commit90f49cc6969ec522457ddce8e864169f5c91e6aa (patch)
treea2c60a397f2a40e0307b3a492cad14afcdac7d7a
parent7c8c80880995e0bce822a6809fe514ce0f3fda36 (diff)
downloadgitlab-ce-90f49cc6969ec522457ddce8e864169f5c91e6aa.tar.gz
Update mail_room gem
-rw-r--r--CHANGELOG1
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
3 files changed, 4 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 30c8e801ea1..67fe6aa4e95 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -68,6 +68,7 @@ v 8.13.0 (unreleased)
- Grouped pipeline dropdown is a scrollable container
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)
diff --git a/Gemfile b/Gemfile
index 3e8ce8b2fc5..0cc98ad9210 100644
--- a/Gemfile
+++ b/Gemfile
@@ -323,7 +323,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 96b49faf727..817c1725879 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)
@@ -886,7 +886,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)