summaryrefslogtreecommitdiff
path: root/doc/markdown
diff options
context:
space:
mode:
authorRens van der Heijden <rens.vanderheijden@uni-ulm.de>2015-01-21 09:50:17 +0100
committerRens van der Heijden <rens.vanderheijden@uni-ulm.de>2015-01-21 09:50:17 +0100
commitbfa8d573c5ff4088f53b97b923fc06f554e82266 (patch)
tree595d99699b8d0f8e888d10fc2f764c47d8dbeeb7 /doc/markdown
parent1050f5230eec21cf47d5af262a1b3e62c07fec5d (diff)
downloadgitlab-ce-bfa8d573c5ff4088f53b97b923fc06f554e82266.tar.gz
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 edb7a975503..7842fdc8f49 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>