diff options
| author | Ben Bodenmiller <bbodenmiller@hotmail.com> | 2015-04-11 01:38:34 -0700 |
|---|---|---|
| committer | Ben Bodenmiller <bbodenmiller@hotmail.com> | 2015-04-11 01:38:34 -0700 |
| commit | efe023e795ab5e1d44f0ead436a363faaf41c538 (patch) | |
| tree | a3b8187b0fd11960c503539fec6e86eb78997117 | |
| parent | 5155b9794db107bdb44297a7c01ced13581ee303 (diff) | |
| download | gitlab-ce-efe023e795ab5e1d44f0ead436a363faaf41c538.tar.gz | |
document support for inline HTML
| -rw-r--r-- | doc/markdown/markdown.md | 4 |
1 files changed, 1 insertions, 3 deletions
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 <dl> @@ -441,8 +441,6 @@ Note that inline HTML is disabled in the default Gitlab configuration, although <dd>Does *not* work **very** well. Use HTML <em>tags</em>.</dd> </dl> -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 ``` |