Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -137,7 +137,7 @@ gem 'seed-fu', '~> 2.3', '>= 2.3.7'
 # Markdown and HTML processing
 gem 'html-pipeline', '~> 2.8'
 gem 'deckar01-task_list', '2.0'
-gem 'gitlab-markup', '~> 1.6', '>= 1.6.4'
+gem 'github-markup', '~> 1.6', '>= 1.6.4'
 gem 'redcarpet', '~> 3.4'
 gem 'commonmarker', '~> 0.17'
 gem 'RedCloth', '~> 4.3', '>= 4.3.2'