Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2017-03-24 19:43:52 +0300
committerMike Greiling <mike@pixelcog.com>2017-03-25 01:06:24 +0300
commit71e798f5d54dc3142605623fdf2bb6b6326827fb (patch)
tree3e4687c4d43d5ee80727e7966d7cb0e86c75fae6 /app/helpers
parent822bfafae2f30d13a3b1bf8f3b31802c31b05072 (diff)
prevent formatted milestone date string from having html escaped
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/milestones_helper.rb2
1 files changed, 2 insertions, 0 deletions
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| "<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