Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrett Walker <bwalker@gitlab.com>2018-08-15 23:51:29 +0300
committerBrett Walker <bwalker@gitlab.com>2018-09-05 17:19:16 +0300
commit5a7451c2f91e5ed7fa95f6abb5eaceaf220945cb (patch)
tree1b99fe086f74e42e997a6b8bbf2f3962298685ef /app/helpers/markup_helper.rb
parentbd807fe0a69fdc53c7423bea8f24e73080fbada6 (diff)
Enable CommonMark for files and wikis
Diffstat (limited to 'app/helpers/markup_helper.rb')
-rw-r--r--app/helpers/markup_helper.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/app/helpers/markup_helper.rb b/app/helpers/markup_helper.rb
index cbb971cf8b7..39e7a7fd396 100644
--- a/app/helpers/markup_helper.rb
+++ b/app/helpers/markup_helper.rb
@@ -107,7 +107,6 @@ module MarkupHelper
def markup(file_name, text, context = {})
context[:project] ||= @project
- context[:markdown_engine] ||= :redcarpet
html = context.delete(:rendered) || markup_unsafe(file_name, text, context)
prepare_for_rendering(html, context)
end
@@ -121,8 +120,7 @@ module MarkupHelper
project: @project,
project_wiki: @project_wiki,
page_slug: wiki_page.slug,
- issuable_state_filter_enabled: true,
- markdown_engine: :redcarpet
+ issuable_state_filter_enabled: true
}
html =