diff options
| author | Andrew Fontaine <afontaine@gitlab.com> | 2019-02-15 14:05:23 -0500 |
|---|---|---|
| committer | Andrew Fontaine <afontaine@gitlab.com> | 2019-02-21 09:34:00 -0500 |
| commit | 37b9173bd55ad9642df1e63075a078c282b31b28 (patch) | |
| tree | 32f8e4a4ed7711922078a5ece25049574a7855fb /app | |
| parent | c8bf9f78f3e481cb7e74384fa45b46b864fa523a (diff) | |
| download | gitlab-ce-37b9173bd55ad9642df1e63075a078c282b31b28.tar.gz | |
Make "moved" Link to Moved Issue
The text "moved" now links to the issue the closed issue was moved to.
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/framework/issue_box.scss | 5 | ||||
| -rw-r--r-- | app/views/projects/issues/show.html.haml | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/issue_box.scss b/app/assets/stylesheets/framework/issue_box.scss index e51f230a680..8c77634edd7 100644 --- a/app/assets/stylesheets/framework/issue_box.scss +++ b/app/assets/stylesheets/framework/issue_box.scss @@ -32,6 +32,11 @@ &.status-box-issue-closed, &.status-box-mr-merged { background-color: $blue-500; + + a { + color: inherit; + text-decoration: underline; + } } &.status-box-open { diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index ca03a3ce75e..728f43c1469 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -14,9 +14,12 @@ .detail-page-header-body .issuable-status-box.status-box.status-box-issue-closed{ class: issue_button_visibility(@issue, false) } = sprite_icon('mobile-issue-close', size: 16, css_class: 'd-block d-sm-none') - %span.d-none.d-sm-block + .d-none.d-sm-block - if @issue.moved? - = _("Closed (moved)") + - moved_link_start = "<a href=\"#{issue_path(@issue.moved_to)}\">".html_safe + - moved_link_end = '</a>'.html_safe + = s_('IssuableStatus|Closed (%{moved_link_start}moved%{moved_link_end})').html_safe % {moved_link_start: moved_link_start, + moved_link_end: moved_link_end} - else = _("Closed") .issuable-status-box.status-box.status-box-open{ class: issue_button_visibility(@issue, true) } |