diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-09-16 22:19:35 -0400 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-09-16 22:19:35 -0400 |
| commit | 480e713c8f1cb240d00b1b2659ef206a164e3733 (patch) | |
| tree | 8ea59769f592ff6559d5cefa8f0a8be6f1090ed2 | |
| parent | cac969229aab74ab5dcd7682c4f1c3a74a17b9d6 (diff) | |
| parent | 4b95b0ebec28fb8205e4f672d2df4e3ace7d5785 (diff) | |
| download | gitlab-ce-480e713c8f1cb240d00b1b2659ef206a164e3733.tar.gz | |
Merge branch 'update-mailroom' into 'master'
See merge request !1306
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -286,7 +286,7 @@ gem "newrelic_rpm", '~> 3.9.4.245' gem 'octokit', '~> 3.7.0' -gem "mail_room", "~> 0.4.2" +gem "mail_room", "~> 0.5.1" gem 'email_reply_parser', '~> 0.5.8' diff --git a/Gemfile.lock b/Gemfile.lock index a4a0762bdd8..eeaddc95a8e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -384,7 +384,7 @@ GEM systemu (~> 2.6.2) mail (2.6.3) mime-types (>= 1.16, < 3) - mail_room (0.4.2) + mail_room (0.5.1) method_source (0.8.2) mime-types (1.25.1) mimemagic (0.3.0) @@ -846,7 +846,7 @@ DEPENDENCIES jquery-ui-rails (~> 4.2.1) kaminari (~> 0.15.1) letter_opener (~> 1.1.2) - mail_room (~> 0.4.2) + mail_room (~> 0.5.1) minitest (~> 5.7.0) mousetrap-rails (~> 1.4.6) mysql2 (~> 0.3.16) |