summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2016-06-21 16:47:29 +0000
committerLin Jen-Shin <godfat@godfat.org>2016-06-21 16:47:29 +0000
commit835e3b0ac66aa24e1e087c1cf87308efd2d22527 (patch)
tree32221c1b5e1c460f3d1ce9b820a0b56ea6d1667c
parent707e8d434da9dd8ee07ac2cb8b9556c132aa52ca (diff)
downloadgitlab-ce-835e3b0ac66aa24e1e087c1cf87308efd2d22527.tar.gz
Update mail_room to 0.8.0 to resolve #13357update-mail_room-to-0.8.0
Which includes the fix from: https://github.com/tpitale/mail_room/pull/73
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index bc1223e1bbc..50a47bfd984 100644
--- a/Gemfile
+++ b/Gemfile
@@ -330,7 +330,7 @@ gem "newrelic_rpm", '~> 3.14'
gem 'octokit', '~> 4.3.0'
-gem "mail_room", "~> 0.7"
+gem "mail_room", "~> 0.8"
gem 'email_reply_parser', '~> 0.5.8'
diff --git a/Gemfile.lock b/Gemfile.lock
index 49e548fb94f..d20514e79e4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -398,7 +398,7 @@ GEM
systemu (~> 2.6.2)
mail (2.6.4)
mime-types (>= 1.16, < 4)
- mail_room (0.7.0)
+ mail_room (0.8.0)
method_source (0.8.2)
mime-types (2.99.2)
mimemagic (0.3.0)
@@ -899,7 +899,7 @@ DEPENDENCIES
license_finder
licensee (~> 8.0.0)
loofah (~> 2.0.3)
- mail_room (~> 0.7)
+ mail_room (~> 0.8)
method_source (~> 0.8)
minitest (~> 5.7.0)
mousetrap-rails (~> 1.4.6)