summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-12-11 16:16:07 +0100
committerDouwe Maan <douwe@gitlab.com>2015-12-11 16:16:07 +0100
commit22999a6fa6b44a835536307da8e5d6a6b349cb49 (patch)
tree548d14cb639012185c405edc24655e652c8c121e /Gemfile
parenta2a68858c88151ce0d77f602dbae59d595495ac6 (diff)
downloadgitlab-ce-22999a6fa6b44a835536307da8e5d6a6b349cb49.tar.gz
Revert "Merge branch 'remove-redcloth' into 'master' "revert-2037
This reverts commit e426c027b0a2a3aa0dea1d833008f2bfd814f483, reversing changes made to c3676aa156981092b7f03f1a3e74bb819cfa2fc3.
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Gemfile b/Gemfile
index 582a1624f05..7298e21ce66 100644
--- a/Gemfile
+++ b/Gemfile
@@ -93,6 +93,7 @@ gem 'html-pipeline', '~> 1.11.0'
gem 'task_list', '~> 1.0.2', require: 'task_list/railtie'
gem 'github-markup', '~> 1.3.1'
gem 'redcarpet', '~> 3.3.3'
+gem 'RedCloth', '~> 4.2.9'
gem 'rdoc', '~>3.6'
gem 'org-ruby', '~> 0.9.12'
gem 'creole', '~> 0.5.0'