diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-14 00:07:41 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-14 00:07:41 +0300 |
| commit | 0e2fc1701bd0c87cc458cbbb34c618b0e0dc5a14 (patch) | |
| tree | 5f08f2602120b0555e5c0dc0061d7c8eea054c22 /Gemfile.lock | |
| parent | 7cc6c10c68915f5019ab8c2029eeb462c8fed4ef (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 55674a79cc2..9913d2d1df9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -596,6 +596,9 @@ 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) @@ -1245,6 +1248,7 @@ 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) |