summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-07-14 12:09:23 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-07-14 12:09:23 +0000
commit0b194c4854f312e36616fccf7c610cb2b0ec6957 (patch)
treef4c3d8ed1cd799e50b979035506675a1d90ad4a9 /Gemfile.lock
parentc1e7698dff17b737299127ecf484443e676cdd4f (diff)
downloadgitlab-ce-0b194c4854f312e36616fccf7c610cb2b0ec6957.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index bcca2d42006..61c01f740c8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -490,7 +490,7 @@ GEM
opentracing (~> 0.4)
pg_query (~> 2.1)
redis (> 3.0.0, < 5.0.0)
- gitlab-license (1.5.0)
+ gitlab-license (2.0.0)
gitlab-mail_room (0.0.9)
gitlab-markup (1.7.1)
gitlab-net-dns (0.9.1)
@@ -1489,7 +1489,7 @@ DEPENDENCIES
gitlab-experiment (~> 0.6.1)
gitlab-fog-azure-rm (~> 1.1.1)
gitlab-labkit (~> 0.20.0)
- gitlab-license (~> 1.5)
+ gitlab-license (~> 2.0)
gitlab-mail_room (~> 0.0.9)
gitlab-markup (~> 1.7.1)
gitlab-net-dns (~> 0.9.1)