diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-02 09:06:09 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-02 09:06:09 +0300 |
| commit | 01de60f3a8f4d99e641d04d31369628425137c21 (patch) | |
| tree | 0d00bf0bd3c93c8ddc49a595ff97ef18b594a259 /Gemfile.lock | |
| parent | 558702b0b569b723474e3652bf46c3b84f322618 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index a290b8f96a5..054a491a019 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -591,9 +591,6 @@ GEM mail_room (0.9.1) marcel (0.3.3) mimemagic (~> 0.3.2) - marginalia (1.8.0) - actionpack (>= 2.3) - activerecord (>= 2.3) memoist (0.16.0) memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) @@ -1246,7 +1243,6 @@ DEPENDENCIES lograge (~> 0.5) loofah (~> 2.2) mail_room (~> 0.9.1) - marginalia (~> 1.8.0) memory_profiler (~> 0.9) method_source (~> 0.8) mimemagic (~> 0.3.2) |