diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2017-03-24 22:52:32 +0000 |
|---|---|---|
| committer | DJ Mountney <david@twkie.net> | 2017-03-27 14:48:13 -0700 |
| commit | b1944d5e13f29fb30beeeebe62f77124fca3dfbd (patch) | |
| tree | 5f00485e46a962e77055c496b4dbd59fd3e8c114 | |
| parent | 0ff304683ef3ae8ceec6d7fc087669a34618bfb0 (diff) | |
| download | gitlab-ce-b1944d5e13f29fb30beeeebe62f77124fca3dfbd.tar.gz | |
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
| -rw-r--r-- | app/helpers/milestones_helper.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/30035-milestone-with-due-date-shows-escaped-html.yml | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/app/helpers/milestones_helper.rb b/app/helpers/milestones_helper.rb index 7011e670cee..29c074fece6 100644 --- a/app/helpers/milestones_helper.rb +++ b/app/helpers/milestones_helper.rb @@ -86,12 +86,14 @@ module MilestonesHelper days = milestone.remaining_days content = content_tag(:strong, days) content << " #{'day'.pluralize(days)} remaining" + content.html_safe elsif milestone.upcoming? content_tag(:strong, 'Upcoming') 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 diff --git a/changelogs/unreleased/30035-milestone-with-due-date-shows-escaped-html.yml b/changelogs/unreleased/30035-milestone-with-due-date-shows-escaped-html.yml new file mode 100644 index 00000000000..651c299ac66 --- /dev/null +++ b/changelogs/unreleased/30035-milestone-with-due-date-shows-escaped-html.yml @@ -0,0 +1,4 @@ +--- +title: Fix escaped html appearing in milestone page +merge_request: 10224 +author: |