Commit ff8fb6a6 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'update-mailroom' into 'master'

Update mail_room to 0.4.2 for better error handling

See merge request !1234
parents 14274cdc d72b8f87
...@@ -268,6 +268,6 @@ gem "newrelic_rpm" ...@@ -268,6 +268,6 @@ gem "newrelic_rpm"
gem 'octokit', '3.7.0' gem 'octokit', '3.7.0'
gem "mail_room", "~> 0.4.1" gem "mail_room", "~> 0.4.2"
gem 'email_reply_parser' gem 'email_reply_parser'
...@@ -370,7 +370,7 @@ GEM ...@@ -370,7 +370,7 @@ GEM
systemu (~> 2.6.2) systemu (~> 2.6.2)
mail (2.6.3) mail (2.6.3)
mime-types (>= 1.16, < 3) mime-types (>= 1.16, < 3)
mail_room (0.4.1) mail_room (0.4.2)
method_source (0.8.2) method_source (0.8.2)
mime-types (1.25.1) mime-types (1.25.1)
mimemagic (0.3.0) mimemagic (0.3.0)
...@@ -805,7 +805,7 @@ DEPENDENCIES ...@@ -805,7 +805,7 @@ DEPENDENCIES
jquery-ui-rails jquery-ui-rails
kaminari (~> 0.15.1) kaminari (~> 0.15.1)
letter_opener letter_opener
mail_room (~> 0.4.1) mail_room (~> 0.4.2)
minitest (~> 5.3.0) minitest (~> 5.3.0)
mousetrap-rails mousetrap-rails
mysql2 mysql2
...@@ -878,3 +878,6 @@ DEPENDENCIES ...@@ -878,3 +878,6 @@ DEPENDENCIES
virtus virtus
webmock (~> 1.21.0) webmock (~> 1.21.0)
wikicloth (= 0.8.1) wikicloth (= 0.8.1)
BUNDLED WITH
1.10.5
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