summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-01-12 16:48:11 -0500
committerRémy Coutable <remy@rymai.me>2017-01-12 16:48:11 -0500
commit6afa2d058ee8cb67fda7b2f7cba71304acf21948 (patch)
tree12a778d7529eb591aba0eac0e3e1aab062af05a9 /Gemfile
parent707570ac7de4867a62ad4c94c95e43e8ca0afbcb (diff)
downloadgitlab-ce-6afa2d058ee8cb67fda7b2f7cba71304acf21948.tar.gz
Update gitlab-markup back to 1.5.1 in Gemfile26627-update-gitlab-markup-to-1-5-1-again
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index b43604bd253..07ff500dfea 100644
--- a/Gemfile
+++ b/Gemfile
@@ -101,7 +101,7 @@ gem 'seed-fu', '~> 2.3.5'
# Markdown and HTML processing
gem 'html-pipeline', '~> 1.11.0'
gem 'deckar01-task_list', '1.0.6', require: 'task_list/railtie'
-gem 'gitlab-markup', '~> 1.5.0'
+gem 'gitlab-markup', '~> 1.5.1'
gem 'redcarpet', '~> 3.3.3'
gem 'RedCloth', '~> 4.3.2'
gem 'rdoc', '~> 4.2'