diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-29 03:07:44 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-29 03:07:44 +0300 |
| commit | e56fd471503e00167ca96e7792f75a0d1f3b7891 (patch) | |
| tree | 87b8b69ea03c78beb5be85c5080c73f601ecc718 /Gemfile.lock | |
| parent | 8831c2df7fa3f1bb567e284e4b8c0a4f441e74b3 (diff) | |
Add latest changes from gitlab-org/gitlab@master
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 f4a0ae4ebef..38de70b41ef 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -388,6 +388,7 @@ GEM opentracing (~> 0.4) redis (> 3.0.0, < 5.0.0) gitlab-license (1.0.0) + gitlab-mail_room (0.0.2) gitlab-markup (1.7.0) gitlab-net-dns (0.9.1) gitlab-puma (4.3.1.gitlab.2) @@ -616,7 +617,6 @@ GEM lumberjack (1.0.13) mail (2.7.1) mini_mime (>= 0.1.1) - mail_room (0.10.0) marcel (0.3.3) mimemagic (~> 0.3.2) marginalia (1.8.0) @@ -1235,6 +1235,7 @@ DEPENDENCIES gitlab-chronic (~> 0.10.5) gitlab-labkit (= 0.10.0) gitlab-license (~> 1.0) + gitlab-mail_room (~> 0.0.2) gitlab-markup (~> 1.7.0) gitlab-net-dns (~> 0.9.1) gitlab-puma (~> 4.3.1.gitlab.2) @@ -1284,7 +1285,6 @@ DEPENDENCIES loofah (~> 2.2) lru_redux mail (= 2.7.1) - mail_room (~> 0.10.0) marginalia (~> 1.8.0) memory_profiler (~> 0.9) method_source (~> 0.8) |