summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-31 18:09:11 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-31 18:09:11 +0000
commit0434f38ef1dce4fe640fe1e4542235746ceb943c (patch)
tree3affe5902c9da74441dfbf5069f76c023b5cd03a /Gemfile.lock
parentc27acb1d376f7127cd33eadcc8f5683ed55262bc (diff)
downloadgitlab-ce-0434f38ef1dce4fe640fe1e4542235746ceb943c.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index e61068bbf7f..ee870d6d3f5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1205,6 +1205,7 @@ DEPENDENCIES
elasticsearch-rails (~> 6.1)
email_reply_trimmer (~> 0.1)
email_spec (~> 2.2.0)
+ erubi (~> 1.9.0)
escape_utils (~> 1.1)
factory_bot_rails (~> 5.1.0)
faraday (~> 0.12)
@@ -1279,7 +1280,6 @@ DEPENDENCIES
license_finder (~> 5.4)
licensee (~> 8.9)
liquid (~> 4.0)
- listen (~> 3.0)
lograge (~> 0.5)
loofah (~> 2.2)
lru_redux