summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
authorGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-08-29 21:34:20 +0000
committerGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-08-29 21:34:20 +0000
commit170cb8bc1828b80019fa45e48bc37161973e7a0e (patch)
tree98a51a0facd35cdf6ed06bb3c4c5dd937cc8c04d /app/helpers
parent7d6ec7f7ed19b9093e8ea604d7f024a1e84a847e (diff)
parent927f608f2c4905e430d2df1c455cec793ef41aa9 (diff)
downloadgitlab-ce-170cb8bc1828b80019fa45e48bc37161973e7a0e.tar.gz
Merge branch 'security-fix-html-injection-for-label-description-ce-master' into 'master'
Fix HTML injection for label description See merge request gitlab/gitlabhq!3250
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/labels_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb
index 2ed016beea4..c5a3507637e 100644
--- a/app/helpers/labels_helper.rb
+++ b/app/helpers/labels_helper.rb
@@ -71,7 +71,7 @@ module LabelsHelper
end
def label_tooltip_title(label)
- label.description
+ Sanitize.clean(label.description)
end
def suggested_colors