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
This commit is contained in:
commit
34870e169d
|
@ -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
|
||||
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
title: Fix escaped html appearing in milestone page
|
||||
merge_request: 10224
|
||||
author:
|
Loading…
Reference in New Issue