summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-08-05 21:09:40 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-08-05 21:09:40 +0000
commitad9eb72915f1be40da3ebe287274fe2bae62e46b (patch)
treee5a029b2edbce0e84a54b6ff4d18e8240680c4c4 /Gemfile.lock
parentf8d20b20be74c283fe8bfe81abfd2d132a500968 (diff)
downloadgitlab-ce-ad9eb72915f1be40da3ebe287274fe2bae62e46b.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 257cfb6b52c..79f2d31bbf6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -598,7 +598,7 @@ GEM
kgio (2.11.3)
knapsack (1.17.0)
rake
- kramdown (2.2.1)
+ kramdown (2.3.0)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
@@ -1308,7 +1308,7 @@ DEPENDENCIES
jwt (~> 2.1.0)
kaminari (~> 1.0)
knapsack (~> 1.17)
- kramdown (~> 2.2.1)
+ kramdown (~> 2.3.0)
kubeclient (~> 4.6.0)
letter_opener_web (~> 1.3.4)
license_finder (~> 5.4)