summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-02-16 09:10:11 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-02-16 09:10:11 +0000
commitb1a0a71628cb4531f3b9a2999f5aa4d22f6ac5fb (patch)
treeaf69c74ae863c73a051297ce5b6b8462460102e9 /Gemfile.lock
parent0e0890828e6574c6bbc3fd2518fe8ffb5a3dd13e (diff)
downloadgitlab-ce-b1a0a71628cb4531f3b9a2999f5aa4d22f6ac5fb.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 9ee9b93f25f..56df7b3ad37 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -594,7 +594,7 @@ GEM
redis (> 3.0.0, < 6.0.0)
gitlab-license (2.2.1)
gitlab-mail_room (0.0.9)
- gitlab-markup (1.8.1)
+ gitlab-markup (1.9.0)
gitlab-net-dns (0.9.1)
gitlab-sidekiq-fetcher (0.9.0)
json (>= 2.5)
@@ -1682,7 +1682,7 @@ DEPENDENCIES
gitlab-labkit (~> 0.30.1)
gitlab-license (~> 2.2.1)
gitlab-mail_room (~> 0.0.9)
- gitlab-markup (~> 1.8.0)
+ gitlab-markup (~> 1.9.0)
gitlab-net-dns (~> 0.9.1)
gitlab-sidekiq-fetcher (= 0.9.0)
gitlab-styles (~> 10.0.0)