summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Edwards-Jones <jedwardsjones@gitlab.com>2017-02-28 23:38:50 +0000
committerJames Edwards-Jones <jedwardsjones@gitlab.com>2017-03-06 16:27:49 +0000
commit9a672c4f81984e07ab2c0c0c456c798adff91514 (patch)
treee27fb20b32ded0059ca6dca96195c9818194314f
parent00f5cb84d55036542165c756e235619631bc7dee (diff)
downloadgitlab-ce-9a672c4f81984e07ab2c0c0c456c798adff91514.tar.gz
Updates Redcarpet (Markdown parser) to 3.4.0
Adds suppport for HTML 5 details and summary tags (https://github.com/vmg/redcarpet/issues/578)
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index a267030eb4c..ca0fc9810a1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -105,7 +105,7 @@ gem 'seed-fu', '~> 2.3.5'
gem 'html-pipeline', '~> 1.11.0'
gem 'deckar01-task_list', '1.0.6', require: 'task_list/railtie'
gem 'gitlab-markup', '~> 1.5.1'
-gem 'redcarpet', '~> 3.3.3'
+gem 'redcarpet', '~> 3.4'
gem 'RedCloth', '~> 4.3.2'
gem 'rdoc', '~> 4.2'
gem 'org-ruby', '~> 0.9.12'
diff --git a/Gemfile.lock b/Gemfile.lock
index 65120df205c..933f7199979 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -583,7 +583,7 @@ GEM
recaptcha (3.0.0)
json
recursive-open-struct (1.0.0)
- redcarpet (3.3.3)
+ redcarpet (3.4.0)
redis (3.2.2)
redis-actionpack (5.0.1)
actionpack (>= 4.0, < 6)
@@ -955,7 +955,7 @@ DEPENDENCIES
rblineprof (~> 0.3.6)
rdoc (~> 4.2)
recaptcha (~> 3.0)
- redcarpet (~> 3.3.3)
+ redcarpet (~> 3.4)
redis (~> 3.2)
redis-namespace (~> 1.5.2)
redis-rails (~> 5.0.1)