summaryrefslogtreecommitdiff
path: root/doc/markdown
diff options
context:
space:
mode:
authorJeroen van Baarsen <jeroenvanbaarsen@gmail.com>2015-02-09 11:52:28 +0100
committerJeroen van Baarsen <jeroenvanbaarsen@gmail.com>2015-02-09 11:52:28 +0100
commitdc365a1d20c2c395c32a2e3869fd1de500c09ae9 (patch)
tree1626393ff8c032eb7efae2639dba8909f0a89b0d /doc/markdown
parent0a34f2dcb562098c481140246f7ac22683b38d76 (diff)
parentbfa8d573c5ff4088f53b97b923fc06f554e82266 (diff)
downloadgitlab-ce-dc365a1d20c2c395c32a2e3869fd1de500c09ae9.tar.gz
Merge pull request #8620 from namnatulco/master
Added a note saying inline HTML is disabled by default
Diffstat (limited to 'doc/markdown')
-rw-r--r--doc/markdown/markdown.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/markdown/markdown.md b/doc/markdown/markdown.md
index 6e258db98e5..abef79b0751 100644
--- a/doc/markdown/markdown.md
+++ b/doc/markdown/markdown.md
@@ -420,6 +420,8 @@ 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.
+
```no-highlight
<dl>
<dt>Definition list</dt>