diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-25 10:21:03 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-25 10:21:03 -0700 |
| commit | 6199da0cb49d2e30071d2bbb08735ce2265c7aff (patch) | |
| tree | 969212c0b02d2bae327501b1c7098014b9ded03a /doc/markdown/markdown.md | |
| parent | eda120dc4d8599e293afec7789847fd22ca0c1b0 (diff) | |
| parent | 057c8c344b6518cb50b81607e0f88734fc164a9e (diff) | |
| download | gitlab-ce-6199da0cb49d2e30071d2bbb08735ce2265c7aff.tar.gz | |
Merge pull request #8007 from mr-vinn/markdown-tags
Allow HTML tags in user Markdown input
Diffstat (limited to 'doc/markdown/markdown.md')
| -rw-r--r-- | doc/markdown/markdown.md | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/markdown/markdown.md b/doc/markdown/markdown.md index 181db287201..965d8fc313f 100644 --- a/doc/markdown/markdown.md +++ b/doc/markdown/markdown.md @@ -441,6 +441,8 @@ 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 ``` |