Commit 34870e16 authored by Alfredo Sumaran's avatar Alfredo Sumaran

Merge branch '30035-milestone-with-due-date-shows-escaped-html' into 'master'

Resolve "Milestone with due date shows escaped HTML"

Closes #30035

See merge request !10224
parents 3e61bd3f 80fb7299
......@@ -89,10 +89,12 @@ module MilestonesHelper
content = time_ago.gsub(/\d+/) { |match| "<strong>#{match}</strong>" }
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
......
---
title: Fix escaped html appearing in milestone page
merge_request: 10224
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