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-24 20:24:01 +0300
commit301e176ef4964b2aa0699821732f4e7c48718d67 (patch)
tree425bcbd195a51bd93f4058a57650f902d4ab9873 /app/helpers
parentec6f091e271806a4b87f227737d3cd151970ccb0 (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