From 1e1f99f2b1b3d79f4b767362fbf8fe1838348175 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Rodr=C3=ADguez?= <alejorro70@gmail.com>
Date: Sat, 10 Nov 2018 12:59:29 -0300
Subject: Update gitlab-markup gem to avoid binary name collision

See https://gitlab.com/gitlab-org/gitlab-ce/issues/53082
---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Gemfile')

diff --git a/Gemfile b/Gemfile
index c7efa790cfd..387d7f9a260 100644
--- a/Gemfile
+++ b/Gemfile
@@ -124,7 +124,7 @@ gem 'seed-fu', '~> 2.3.7'
 # Markdown and HTML processing
 gem 'html-pipeline', '~> 2.8'
 gem 'deckar01-task_list', '2.0.0'
-gem 'gitlab-markup', '~> 1.6.4'
+gem 'gitlab-markup', '~> 1.6.5'
 gem 'github-markup', '~> 1.7.0', require: 'github/markup'
 gem 'redcarpet', '~> 3.4'
 gem 'commonmarker', '~> 0.17'
-- 
cgit v1.2.3