diff options
| author | Brett Walker <brett@digitalmoksha.com> | 2018-06-14 08:30:16 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-06-14 08:30:16 +0000 |
| commit | f79410fe1772798d7fa1b288880e14e806483c3c (patch) | |
| tree | 8dd792d5ced0bb0e9b2f26ebae2cc9e28c2fd4a6 /lib | |
| parent | 458d18fef60abc3a1a94701514de7012295d6be5 (diff) | |
| download | gitlab-ce-f79410fe1772798d7fa1b288880e14e806483c3c.tar.gz | |
enable CommonMark as the default
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/markdown.rb | 4 | ||||
| -rw-r--r-- | lib/banzai/filter/markdown_filter.rb | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/lib/api/markdown.rb b/lib/api/markdown.rb index b9ed68aa584..5d55224c1a7 100644 --- a/lib/api/markdown.rb +++ b/lib/api/markdown.rb @@ -10,9 +10,7 @@ module API detail "This feature was introduced in GitLab 11.0." end post do - # Explicitly set CommonMark as markdown engine to use. - # Remove this set when https://gitlab.com/gitlab-org/gitlab-ce/issues/43011 is done. - context = { markdown_engine: :common_mark, only_path: false } + context = { only_path: false } if params[:project] project = Project.find_by_full_path(params[:project]) diff --git a/lib/banzai/filter/markdown_filter.rb b/lib/banzai/filter/markdown_filter.rb index c1e2b680240..944363f17d3 100644 --- a/lib/banzai/filter/markdown_filter.rb +++ b/lib/banzai/filter/markdown_filter.rb @@ -14,7 +14,7 @@ module Banzai private - DEFAULT_ENGINE = :redcarpet + DEFAULT_ENGINE = :common_mark def engine(engine_from_context) engine_from_context ||= DEFAULT_ENGINE |