diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-08-03 15:18:35 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-08-03 15:18:35 +0300 |
| commit | c3d02481519a29927e63d55b417b3e5ef71f1bd1 (patch) | |
| tree | ceaba1dbfe3135c01b78c0b5e2efecf50a0d94bf /app | |
| parent | 6f2fc50f0db94ac0cc26ca444e5ddf71c0392989 (diff) | |
| parent | c0c9e5dd6f2ff98240e6e4c3deba9cd2b1112b4d (diff) | |
Merge branch '49899-merge-request-e-mail-link-has-full-url' into 'master'
Resolve "Merge request e-mail link has full URL"
Closes #49899
See merge request gitlab-org/gitlab-ce!21000
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/layouts/notify.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/layouts/notify.html.haml b/app/views/layouts/notify.html.haml index 31e02f1ee19..1c3e05e07f4 100644 --- a/app/views/layouts/notify.html.haml +++ b/app/views/layouts/notify.html.haml @@ -14,7 +14,7 @@ %br - if @target_url - if @reply_by_email - = _('Reply to this email directly or %{view_it_on_gitlab}.') % { view_it_on_gitlab: link_to(_("view it on GitLab"), @target_url) } + = _('Reply to this email directly or %{view_it_on_gitlab}.').html_safe % { view_it_on_gitlab: link_to(_("view it on GitLab"), @target_url) } - else #{link_to _("View it on GitLab"), @target_url}. %br |