diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-03-24 11:43:52 -0500 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-03-24 17:06:24 -0500 |
| commit | 71e798f5d54dc3142605623fdf2bb6b6326827fb (patch) | |
| tree | 3e4687c4d43d5ee80727e7966d7cb0e86c75fae6 /app/helpers/milestones_helper.rb | |
| parent | 822bfafae2f30d13a3b1bf8f3b31802c31b05072 (diff) | |
| download | gitlab-ce-71e798f5d54dc3142605623fdf2bb6b6326827fb.tar.gz | |
prevent formatted milestone date string from having html escaped
Diffstat (limited to 'app/helpers/milestones_helper.rb')
| -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 |