diff options
author | Brett Walker <bwalker@gitlab.com> | 2018-09-04 14:21:20 -0500 |
---|---|---|
committer | Brett Walker <bwalker@gitlab.com> | 2018-09-05 09:19:16 -0500 |
commit | c4f26d4b1c9adcbfc3ad45b71534b990e2b6692b (patch) | |
tree | 4cfbc11da4275bd6a24dc65594b6998ffd076d32 /app/helpers/markup_helper.rb | |
parent | 3aea946e7f590319ff7b85dbbd4eedfc20569deb (diff) | |
download | gitlab-ce-c4f26d4b1c9adcbfc3ad45b71534b990e2b6692b.tar.gz |
added feature flag 'commonmark_for_repositories'
Diffstat (limited to 'app/helpers/markup_helper.rb')
-rw-r--r-- | app/helpers/markup_helper.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/helpers/markup_helper.rb b/app/helpers/markup_helper.rb index 6b826dac84c..3adaa1366c0 100644 --- a/app/helpers/markup_helper.rb +++ b/app/helpers/markup_helper.rb @@ -107,6 +107,7 @@ module MarkupHelper def markup(file_name, text, context = {}) context[:project] ||= @project + context[:markdown_engine] ||= :redcarpet unless commonmark_for_repositories_enabled? html = context.delete(:rendered) || markup_unsafe(file_name, text, context) prepare_for_rendering(html, context) end @@ -122,6 +123,7 @@ module MarkupHelper page_slug: wiki_page.slug, issuable_state_filter_enabled: true ) + context[:markdown_engine] ||= :redcarpet unless commonmark_for_repositories_enabled? html = case wiki_page.format @@ -176,6 +178,10 @@ module MarkupHelper end end + def commonmark_for_repositories_enabled? + Feature.enabled?(:commonmark_for_repositories, default_enabled: true) + end + private # Return +text+, truncated to +max_chars+ characters, excluding any HTML |