summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2018-03-07 13:12:14 +0000
committerSean McGivern <sean@mcgivern.me.uk>2018-03-07 13:12:14 +0000
commitfc65f56399796c2b6698597f5df3d8ea343d1a77 (patch)
treefcbd8500978dc305143db0c474b9e28a82d78067 /Gemfile.lock
parent0bae567369e51c9a8590101633adf435066ac18d (diff)
parentaa60db6cee8e285a39077c567c7f59fecbd0e0a3 (diff)
downloadgitlab-ce-fc65f56399796c2b6698597f5df3d8ea343d1a77.tar.gz
Merge branch 'replace_redcarpet_with_cmark' into 'master'
Add CommonMark markdown engine See merge request gitlab-org/gitlab-ce!14835
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock5
1 files changed, 5 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 010d4f7b56a..bbdc48f964d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -131,6 +131,8 @@ GEM
coercible (1.0.0)
descendants_tracker (~> 0.0.1)
colorize (0.7.7)
+ commonmarker (0.17.8)
+ ruby-enum (~> 0.5)
concord (0.1.5)
adamantium (~> 0.2.0)
equalizer (~> 0.0.9)
@@ -797,6 +799,8 @@ GEM
rubocop (>= 0.51)
rubocop-rspec (1.22.1)
rubocop (>= 0.52.1)
+ ruby-enum (0.7.2)
+ i18n
ruby-fogbugz (0.2.1)
crack (~> 0.4)
ruby-prof (0.16.2)
@@ -1019,6 +1023,7 @@ DEPENDENCIES
charlock_holmes (~> 0.7.5)
chronic (~> 0.10.2)
chronic_duration (~> 0.10.6)
+ commonmarker (~> 0.17)
concurrent-ruby (~> 1.0.5)
connection_pool (~> 2.0)
creole (~> 0.5.0)