diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-05-05 15:34:04 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-05-05 15:34:04 +0300 |
| commit | 1c65019742af734dd6f0fd5a5e185952f859ab9e (patch) | |
| tree | f7a97d7d17906ef6a4712cee406c1315cdec8331 /Gemfile.lock | |
| parent | c583433862558550c8caedb03217880568dcdefc (diff) | |
| parent | 6243a834115c9c815fe9a1224824f02f9fb3857f (diff) | |
Merge branch 'stanhu/gitlab-ce-bump-mailroom'
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 2d20a30e677..41d2922f63e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -467,7 +467,7 @@ GEM systemu (~> 2.6.2) mail (2.6.4) mime-types (>= 1.16, < 4) - mail_room (0.6.1) + mail_room (0.7.0) method_source (0.8.2) mime-types (2.99.1) mimemagic (0.3.0) @@ -964,7 +964,7 @@ DEPENDENCIES letter_opener_web (~> 1.3.0) licensee (~> 8.0.0) loofah (~> 2.0.3) - mail_room (~> 0.6.1) + mail_room (~> 0.7) method_source (~> 0.8) minitest (~> 5.7.0) mousetrap-rails (~> 1.4.6) |