diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-09-24 18:09:31 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-09-24 18:09:31 +0000 |
| commit | 1fef314df26a05bb204263129b12925ccfca0a90 (patch) | |
| tree | 1e02b12cc0ab5e138802b83e22b794622a03d466 /Gemfile.lock | |
| parent | e6655fe417be29c5fb895750512e0f3e449dd8b8 (diff) | |
| parent | f6be2e0d6c666e12f0025e476db9e8387ff8ed79 (diff) | |
| download | gitlab-ce-1fef314df26a05bb204263129b12925ccfca0a90.tar.gz | |
Merge branch 'update-mailroom' into 'master'
Update mailroom to 0.5.2
Fixes #2698 and #2711.
See merge request !1424
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 15a0b019b1d..e306c1f56e6 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.5.1) + mail_room (0.5.2) method_source (0.8.2) mime-types (1.25.1) mimemagic (0.3.0) @@ -851,7 +851,7 @@ DEPENDENCIES jquery-ui-rails (~> 4.2.1) kaminari (~> 0.16.3) letter_opener (~> 1.1.2) - mail_room (~> 0.5.1) + mail_room (~> 0.5.2) minitest (~> 5.7.0) mousetrap-rails (~> 1.4.6) mysql2 (~> 0.3.16) |