diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-02-21 20:36:04 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-02-21 20:36:04 +0000 |
| commit | deb62183edbd9111691f62a4f6a9febb1fcd79f7 (patch) | |
| tree | 8a788214a0286ce247670ff7694e6dff4f1d88d3 /Gemfile.lock | |
| parent | 7af8bb2608fddfacd54e215877780cb91cade93d (diff) | |
| parent | 649a1fcf15a239c08911040e355da112a33a2f31 (diff) | |
| download | gitlab-ce-deb62183edbd9111691f62a4f6a9febb1fcd79f7.tar.gz | |
Merge branch '1363-redo-mailroom-support' into 'master'
Redo internals of Incoming Mail Support
See merge request !9385
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 e0c600f64c0..2a3be763753 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -408,7 +408,7 @@ GEM nokogiri (>= 1.5.9) mail (2.6.4) mime-types (>= 1.16, < 4) - mail_room (0.9.0) + mail_room (0.9.1) memoist (0.15.0) method_source (0.8.2) mime-types (2.99.3) @@ -909,7 +909,7 @@ DEPENDENCIES license_finder (~> 2.1.0) licensee (~> 8.0.0) loofah (~> 2.0.3) - mail_room (~> 0.9.0) + mail_room (~> 0.9.1) method_source (~> 0.8) minitest (~> 5.7.0) mousetrap-rails (~> 1.4.6) |