diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-09-02 21:53:50 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-09-02 21:53:50 +0000 |
| commit | ff8fb6a6a26578c02f04a2f7450a769b2f293d58 (patch) | |
| tree | bf3a9f966f4dc2a51eb3b1ea30855e8d63bbf3b8 | |
| parent | 14274cdc3bb3770dc9390f0735ca36536ca53ea1 (diff) | |
| parent | d72b8f87ac44fd90d0b0efb09ac72e1be9d33745 (diff) | |
| download | gitlab-ce-ff8fb6a6a26578c02f04a2f7450a769b2f293d58.tar.gz | |
Merge branch 'update-mailroom' into 'master'
Update mail_room to 0.4.2 for better error handling
See merge request !1234
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 7 |
2 files changed, 6 insertions, 3 deletions
@@ -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 |