diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2019-01-28 20:56:21 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2019-01-28 20:56:21 +0000 |
| commit | bbf6e65dd2874ae1866ee6d87713f45de1f95d55 (patch) | |
| tree | 1fbf5d9050ffd59d0cb5f6a2381e99933d3301e9 /app | |
| parent | 58f088e5442dd0929182f1d91a08cf8c7ff1526a (diff) | |
| parent | 01a713d64c69fb1b1785c614a336f20ad911bbef (diff) | |
| download | gitlab-ce-bbf6e65dd2874ae1866ee6d87713f45de1f95d55.tar.gz | |
Merge branch '36445-better-indication-that-an-issue-has-been-moved-or-marked-as-duplicated' into 'master'
Indicate on Issue Status if an Issue was Moved
Closes #36445
See merge request gitlab-org/gitlab-ce!24470
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/issues/show.html.haml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index f048fb91304..653b7d4c6f3 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -15,7 +15,10 @@ .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 - Closed + - if @issue.moved? + = _("Closed (moved)") + - else + = _("Closed") .issuable-status-box.status-box.status-box-open{ class: issue_button_visibility(@issue, true) } = sprite_icon('issue-open-m', size: 16, css_class: 'd-block d-sm-none') %span.d-none.d-sm-block Open |