diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-05-29 19:01:12 -0400 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-06-02 13:04:10 -0400 |
| commit | 023dd2907b4afa0bae5f8482cae75e1edd6954a8 (patch) | |
| tree | 930783eafc875c69ebab009f6f0188ff58092bf1 /lib/gitlab/markdown.rb | |
| parent | 1a52f19c456dfa307dd7fa0e5adbaa2ed1a68889 (diff) | |
| download | gitlab-ce-023dd2907b4afa0bae5f8482cae75e1edd6954a8.tar.gz | |
Add a `pipeline` context option for SanitizationFilter
When this option is `:description`, we use a more restrictive whitelist.
This is used for Project and Group description fields.
Diffstat (limited to 'lib/gitlab/markdown.rb')
| -rw-r--r-- | lib/gitlab/markdown.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb index 5db1566f55d..fa9c0975bb8 100644 --- a/lib/gitlab/markdown.rb +++ b/lib/gitlab/markdown.rb @@ -57,6 +57,9 @@ module Gitlab pipeline = HTML::Pipeline.new(filters) context = { + # SanitizationFilter + pipeline: options[:pipeline], + # EmojiFilter asset_root: Gitlab.config.gitlab.url, asset_host: Gitlab::Application.config.asset_host, |