diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-02 21:39:18 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-02 21:39:18 +0300 |
| commit | 79aac2c128e0c2fa8fd657af273fbd219002f39c (patch) | |
| tree | be65a8f1a10fc6f99d7de160e11a679ff549dee5 /lib/redcarpet/render/gitlab_html.rb | |
| parent | 34d176ad577ea421c99c87a54196deda92f796e8 (diff) | |
| parent | a916936f3feeda0a6d58fef2c06c51f95f10c45a (diff) | |
Merge branch 'ignore-references' into 'master'
Don't notify users mentioned in code blocks or blockquotes.
cc @rspeicher
See merge request !753
Diffstat (limited to 'lib/redcarpet/render/gitlab_html.rb')
| -rw-r--r-- | lib/redcarpet/render/gitlab_html.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/redcarpet/render/gitlab_html.rb b/lib/redcarpet/render/gitlab_html.rb index 7dcecc2ecf6..2f7aff03c2a 100644 --- a/lib/redcarpet/render/gitlab_html.rb +++ b/lib/redcarpet/render/gitlab_html.rb @@ -10,6 +10,8 @@ class Redcarpet::Render::GitlabHTML < Redcarpet::Render::HTML @options = options.dup @options.reverse_merge!( + # Handled further down the line by Gitlab::Markdown::SanitizationFilter + escape_html: false, project: @template.instance_variable_get("@project") ) |