diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-25 00:09:39 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-25 00:09:39 +0300 |
| commit | c019f485556acef2baa8e1886559e252710361a0 (patch) | |
| tree | 52ef90a76fd4d2f6bbda66f2328f875cb2ceaed4 /app/helpers/issuables_helper.rb | |
| parent | 72875e4a370cf2014e7bb35633d63ccb938e4edb (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/issuables_helper.rb')
| -rw-r--r-- | app/helpers/issuables_helper.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb index 77ced17bc22..229239f53a5 100644 --- a/app/helpers/issuables_helper.rb +++ b/app/helpers/issuables_helper.rb @@ -189,6 +189,10 @@ module IssuablesHelper output = [] output << "Opened #{time_ago_with_tooltip(issuable.created_at)} by ".html_safe + if issuable.is_a?(Issue) && issuable.service_desk_reply_to + output << "#{html_escape(issuable.service_desk_reply_to)} via " + end + output << content_tag(:strong) do author_output = link_to_member(project, issuable.author, size: 24, mobile_classes: "d-none d-sm-inline") author_output << link_to_member(project, issuable.author, size: 24, by_username: true, avatar: false, mobile_classes: "d-inline d-sm-none") |