diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-08-26 19:23:51 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-08-26 19:23:51 +0300 |
| commit | de3b7d9c522db8d129a64f2b86297cf90413cb1e (patch) | |
| tree | acd7f1ded6034005dd9b1ddc825b549b4e1b92cc | |
| parent | ef0149dd4440e1ea6d164f096112a5004a10ccf6 (diff) | |
| parent | bc683a590402b6ce017a613616623b65b6823ec4 (diff) | |
Merge branch 'update-mail-room' into 'master'
Update mail_room
See merge request !1213
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -273,6 +273,6 @@ gem "newrelic_rpm" gem 'octokit', '3.7.0' -gem "mail_room", "~> 0.4.0" +gem "mail_room", "~> 0.4.1" gem 'email_reply_parser' diff --git a/Gemfile.lock b/Gemfile.lock index a7cfe6b7511..814249c7ff6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -372,7 +372,7 @@ GEM systemu (~> 2.6.2) mail (2.6.3) mime-types (>= 1.16, < 3) - mail_room (0.4.0) + mail_room (0.4.1) method_source (0.8.2) mime-types (1.25.1) mimemagic (0.3.0) @@ -808,7 +808,7 @@ DEPENDENCIES jquery-ui-rails kaminari (~> 0.15.1) letter_opener - mail_room (~> 0.4.0) + mail_room (~> 0.4.1) minitest (~> 5.3.0) mousetrap-rails mysql2 |