From 301e176ef4964b2aa0699821732f4e7c48718d67 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Fri, 24 Mar 2017 11:43:52 -0500 Subject: [PATCH 1/2] prevent formatted milestone date string from having html escaped --- app/helpers/milestones_helper.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/helpers/milestones_helper.rb b/app/helpers/milestones_helper.rb index 5053b937c02..bd3f51fc658 100644 --- a/app/helpers/milestones_helper.rb +++ b/app/helpers/milestones_helper.rb @@ -89,10 +89,12 @@ module MilestonesHelper content = time_ago.gsub(/\d+/) { |match| "#{match}" } content.slice!("about ") content << " remaining" + content.html_safe elsif milestone.start_date && milestone.start_date.past? days = milestone.elapsed_days content = content_tag(:strong, days) content << " #{'day'.pluralize(days)} elapsed" + content.html_safe end end From 80fb72996403691865b6ed2c154fbfd86717fce0 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Fri, 24 Mar 2017 12:44:08 -0500 Subject: [PATCH 2/2] add CHANGELOG.md entry for !10224 --- .../30035-milestone-with-due-date-shows-escaped-html.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 changelogs/unreleased/30035-milestone-with-due-date-shows-escaped-html.yml diff --git a/changelogs/unreleased/30035-milestone-with-due-date-shows-escaped-html.yml b/changelogs/unreleased/30035-milestone-with-due-date-shows-escaped-html.yml new file mode 100644 index 00000000000..651c299ac66 --- /dev/null +++ b/changelogs/unreleased/30035-milestone-with-due-date-shows-escaped-html.yml @@ -0,0 +1,4 @@ +--- +title: Fix escaped html appearing in milestone page +merge_request: 10224 +author: