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 /app | |
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 'app')
-rw-r--r-- | app/views/groups/show.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/_home_panel.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml index f42007da073..0687840af39 100644 --- a/app/views/groups/show.html.haml +++ b/app/views/groups/show.html.haml @@ -11,7 +11,7 @@ @#{@group.path} - if @group.description.present? .description - = markdown(@group.description) + = markdown(@group.description, pipeline: :description) %hr = render 'shared/show_aside' diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml index 05f44acd3cb..076afb11a9d 100644 --- a/app/views/projects/_home_panel.html.haml +++ b/app/views/projects/_home_panel.html.haml @@ -5,7 +5,7 @@ .project-home-row.project-home-row-top .project-home-desc - if @project.description.present? - = markdown(@project.description) + = markdown(@project.description, pipeline: :description) - if can?(current_user, :admin_project, @project) – = link_to 'Edit', edit_namespace_project_path |