diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-06-21 22:58:14 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-06-21 22:58:14 +0000 |
| commit | 0909535ef755e1e1cbd3a5c4c8b8f5d00012e538 (patch) | |
| tree | 5721b17c5f428811f43ab0fca689fc6952a5d108 | |
| parent | 1cc3d14a6cd318b03245c337cc3ecd60f515be0a (diff) | |
| parent | 835e3b0ac66aa24e1e087c1cf87308efd2d22527 (diff) | |
| download | gitlab-ce-18848-pagination-overflows-on-mobile.tar.gz | |
Merge branch 'update-mail_room-to-0.8.0' into 'master'
18848-pagination-overflows-on-mobile
Update mail_room to 0.8.0 to resolve #13357
Update mail_room to 0.8.0 to resolve #13357
Which includes the fix from:
https://github.com/tpitale/mail_room/pull/73
See merge request !4835
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -330,7 +330,7 @@ gem "newrelic_rpm", '~> 3.14' gem 'octokit', '~> 4.3.0' -gem "mail_room", "~> 0.7" +gem "mail_room", "~> 0.8" gem 'email_reply_parser', '~> 0.5.8' diff --git a/Gemfile.lock b/Gemfile.lock index ed01d766e80..ba16e4bf337 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -398,7 +398,7 @@ GEM systemu (~> 2.6.2) mail (2.6.4) mime-types (>= 1.16, < 4) - mail_room (0.7.0) + mail_room (0.8.0) method_source (0.8.2) mime-types (2.99.2) mimemagic (0.3.0) @@ -899,7 +899,7 @@ DEPENDENCIES license_finder licensee (~> 8.0.0) loofah (~> 2.0.3) - mail_room (~> 0.7) + mail_room (~> 0.8) method_source (~> 0.8) minitest (~> 5.7.0) mousetrap-rails (~> 1.4.6) |