diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-29 18:06:24 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-29 18:06:24 +0000 |
| commit | 8263f6ee3131cdea3c6041785c32771a6af0b24f (patch) | |
| tree | 3dde0ed2466b10fa223eacbd51c78beb32009fbd /Gemfile.lock | |
| parent | eac0da9a47f0c7b8b970833d7d5b96cfee057bf7 (diff) | |
| download | gitlab-ce-8263f6ee3131cdea3c6041785c32771a6af0b24f.tar.gz | |
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 054a491a019..a290b8f96a5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -591,6 +591,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) @@ -1243,6 +1246,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) |