Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-03-06 22:27:56 +0300
committerDouwe Maan <douwe@gitlab.com>2017-03-06 22:27:56 +0300
commit03b310895b2a41a7cc8331fac6f3e9c9f9687a26 (patch)
treea01d8e2ad426ae4e92ce9a8636a8212c742110eb /Gemfile
parent79b8f02bb1780b3de9eb01d69aa3ff59954d5324 (diff)
parent9a672c4f81984e07ab2c0c0c456c798adff91514 (diff)
Merge branch '21605-allow-html5-details' into 'master'
SanitizationFilter allows html5 details and summary (Issue #21605) Closes #21605 See merge request !6568
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 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'