diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-03-24 11:43:52 -0500 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-03-24 12:24:01 -0500 |
| commit | 301e176ef4964b2aa0699821732f4e7c48718d67 (patch) | |
| tree | 425bcbd195a51bd93f4058a57650f902d4ab9873 /app | |
| parent | ec6f091e271806a4b87f227737d3cd151970ccb0 (diff) | |
| download | gitlab-ce-301e176ef4964b2aa0699821732f4e7c48718d67.tar.gz | |
prevent formatted milestone date string from having html escaped
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/milestones_helper.rb | 2 |
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 |