diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-10-27 15:51:34 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-10-27 15:51:34 +0100 |
| commit | e5950e687c42db006daf9147254e111f4e68c3f1 (patch) | |
| tree | 17a53b50471c0ca6fad0f65bd9b14d6a8f6f889c /Gemfile.lock | |
| parent | f879319840949c1d4b363742cb9573d89abd1296 (diff) | |
| parent | f9126fbe0a73aa6d8d61be2eb249260fa29ac461 (diff) | |
| download | gitlab-ce-e5950e687c42db006daf9147254e111f4e68c3f1.tar.gz | |
Merge branch '21645-mail_room_sentinel'
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 442184b9228..536435d3cf6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -402,7 +402,7 @@ GEM systemu (~> 2.6.2) mail (2.6.4) mime-types (>= 1.16, < 4) - mail_room (0.8.1) + mail_room (0.9.0) method_source (0.8.2) mime-types (2.99.3) mimemagic (0.3.0) @@ -893,7 +893,7 @@ DEPENDENCIES license_finder (~> 2.1.0) licensee (~> 8.0.0) loofah (~> 2.0.3) - mail_room (~> 0.8.1) + mail_room (~> 0.9.0) method_source (~> 0.8) minitest (~> 5.7.0) mousetrap-rails (~> 1.4.6) @@ -994,4 +994,4 @@ DEPENDENCIES wikicloth (= 0.8.1) BUNDLED WITH - 1.13.2 + 1.13.3 |