From 8263f6ee3131cdea3c6041785c32771a6af0b24f Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Fri, 29 Nov 2019 18:06:24 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 Gemfile.lock | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'Gemfile.lock')

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)
-- 
cgit v1.2.1