summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorGabriel Mazetto <gabriel@gitlab.com>2016-10-13 04:44:23 +0200
committerGabriel Mazetto <gabriel@gitlab.com>2016-10-13 13:49:11 +0200
commit2549db7aaed7cad60d5ddf129a70da25b09aded2 (patch)
tree75dc0d676f60f53adf41a0f88996ae1ebddcb45d /Gemfile
parent0eb5b0a08af7ebe68d515a68e2a94b3d0213393f (diff)
downloadgitlab-ce-2549db7aaed7cad60d5ddf129a70da25b09aded2.tar.gz
Updated gitlab-markup forked gem to download from rubygemsbug/rst-forked-gem
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 7323776d24c..1204a546983 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.5', require: 'task_list/railtie'
-gem 'github-markup', '~> 1.4', git: 'https://github.com/brodock/github-markup.git', branch: 'python3-fix'
+gem 'gitlab-markup', '~> 1.5.0'
gem 'redcarpet', '~> 3.3.3'
gem 'RedCloth', '~> 4.3.2'
gem 'rdoc', '~>3.6'