Commit 7f6cddc2 authored by Robert Speicher's avatar Robert Speicher Committed by Bob Van Landuyt

Merge branch 'fix-hamlit-xss-ee' into 'security-9-1-ee'

New Hamlit XSS fix, does not include extraneous changes

See merge request !509
parent f695ef55
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
.panel-body .panel-body
%pre %pre
:preserve :preserve
#{@project.import_error.try(:strip)} #{h(@project.import_error.try(:strip))}
.form-group .form-group
= f.check_box :mirror, class: "pull-left" = f.check_box :mirror, class: "pull-left"
.prepend-left-20 .prepend-left-20
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
.panel-body .panel-body
%pre %pre
:preserve :preserve
#{@remote_mirror.last_error.strip} #{h(@remote_mirror.last_error.strip)}
= f.fields_for :remote_mirrors, @remote_mirror do |rm_form| = f.fields_for :remote_mirrors, @remote_mirror do |rm_form|
.form-group .form-group
= rm_form.check_box :enabled, class: "pull-left" = rm_form.check_box :enabled, class: "pull-left"
......
---
title: Fix for XSS in project mirror errors caused by Hamlit filter usage.
merge_request:
author:
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment