From efe023e795ab5e1d44f0ead436a363faaf41c538 Mon Sep 17 00:00:00 2001 From: Ben Bodenmiller Date: Sat, 11 Apr 2015 01:38:34 -0700 Subject: document support for inline HTML --- doc/markdown/markdown.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'doc') diff --git a/doc/markdown/markdown.md b/doc/markdown/markdown.md index 965d8fc313f..1d5fd4c8b0d 100644 --- a/doc/markdown/markdown.md +++ b/doc/markdown/markdown.md @@ -421,7 +421,7 @@ Quote break. You can also use raw HTML in your Markdown, and it'll mostly work pretty well. -Note that inline HTML is disabled in the default Gitlab configuration, although it is [possible](https://github.com/gitlabhq/gitlabhq/pull/8007/commits) for the system administrator to enable it. +See the documentation for HTML::Pipeline's [SanitizationFilter](http://www.rubydoc.info/gems/html-pipeline/HTML/Pipeline/SanitizationFilter#WHITELIST-constant) class for the list of allowed HTML tags and attributes. In addition to the default `SanitizationFilter` whitelist, GitLab allows the `class`, `id`, and `style` attributes. ```no-highlight
@@ -441,8 +441,6 @@ Note that inline HTML is disabled in the default Gitlab configuration, although
Does *not* work **very** well. Use HTML tags.
-See the documentation for HTML::Pipeline's [SanitizationFilter](http://www.rubydoc.info/gems/html-pipeline/HTML/Pipeline/SanitizationFilter#WHITELIST-constant) class for the list of allowed HTML tags and attributes. In addition to the default `SanitizationFilter` whitelist, GitLab allows the `class`, `id`, and `style` attributes. - ## Horizontal Rule ``` -- cgit v1.2.3