summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-09-02 08:12:01 +0100
committerDouwe Maan <douwe@gitlab.com>2015-09-02 08:12:01 +0100
commitd72b8f87ac44fd90d0b0efb09ac72e1be9d33745 (patch)
treed1d2dd56052a0170e65ae2d8ab2cc5fedf6ad403
parent308c6428aef2a46b0370a24d85a97b0e133283a8 (diff)
downloadgitlab-ce-d72b8f87ac44fd90d0b0efb09ac72e1be9d33745.tar.gz
Update mail_room to 0.4.2 for better error handling
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock7
2 files changed, 6 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index 2a55bb31cb9..36b71959743 100644
--- a/Gemfile
+++ b/Gemfile
@@ -268,6 +268,6 @@ gem "newrelic_rpm"
gem 'octokit', '3.7.0'
-gem "mail_room", "~> 0.4.1"
+gem "mail_room", "~> 0.4.2"
gem 'email_reply_parser'
diff --git a/Gemfile.lock b/Gemfile.lock
index 2450b95d973..181b72e07e2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -370,7 +370,7 @@ GEM
systemu (~> 2.6.2)
mail (2.6.3)
mime-types (>= 1.16, < 3)
- mail_room (0.4.1)
+ mail_room (0.4.2)
method_source (0.8.2)
mime-types (1.25.1)
mimemagic (0.3.0)
@@ -805,7 +805,7 @@ DEPENDENCIES
jquery-ui-rails
kaminari (~> 0.15.1)
letter_opener
- mail_room (~> 0.4.1)
+ mail_room (~> 0.4.2)
minitest (~> 5.3.0)
mousetrap-rails
mysql2
@@ -878,3 +878,6 @@ DEPENDENCIES
virtus
webmock (~> 1.21.0)
wikicloth (= 0.8.1)
+
+BUNDLED WITH
+ 1.10.5