diff options
author | Ash McKenzie <amckenzie@gitlab.com> | 2019-04-30 03:34:49 +0300 |
---|---|---|
committer | Ash McKenzie <amckenzie@gitlab.com> | 2019-04-30 03:34:49 +0300 |
commit | 5d5b9d57de9b781c5cc4ecdfb86a3d735ba52c7a (patch) | |
tree | fdb7050cb3e15aab8e8f1c2d23862b051dd9f72f /app/views | |
parent | 7ae2107d9ebca0adecc8a21cacd1bfb6e89ee3ab (diff) | |
parent | cf0265723479b2e511595312f8d053f737fa3d57 (diff) |
Merge branch '60476-actionview-missingtemplate-missing-template-projects-issues-_merge_requests-with-locale-en-formats-html-varian' into 'master'
Delete leftover code for referenced_merge_requests endpoint
Closes #60476
See merge request gitlab-org/gitlab-ce!27335
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/projects/issues/_merge_requests_status.html.haml | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/app/views/projects/issues/_merge_requests_status.html.haml b/app/views/projects/issues/_merge_requests_status.html.haml deleted file mode 100644 index 90838a75214..00000000000 --- a/app/views/projects/issues/_merge_requests_status.html.haml +++ /dev/null @@ -1,25 +0,0 @@ -- time_format = '%b %e, %Y %l:%M%P %Z%z' - -- if merge_request.merged? - - mr_status_date = merge_request.merged_at - - mr_status_title = _('Merged') - - mr_status_icon = 'merge' - - mr_status_class = 'merged' -- elsif merge_request.closed? - - mr_status_date = merge_request.closed_event&.created_at - - mr_status_title = _('Closed') - - mr_status_icon = 'issue-close' - - mr_status_class = 'closed' -- else - - mr_status_date = merge_request.created_at - - mr_status_title = mr_status_date ? _('Opened') : _('Open') - - mr_status_icon = 'issue-open-m' - - mr_status_class = 'open' - -- if mr_status_date - - mr_status_tooltip = "<div><span class=\"bold\">#{mr_status_title}</span> #{time_ago_in_words(mr_status_date)} ago</div><span class=\"text-tertiary\">#{l(mr_status_date.to_time, format: time_format)}</span>" -- else - - mr_status_tooltip = "<div><span class=\"bold\">#{mr_status_title}</span></div>" - -%span.mr-status-wrapper.suggestion-help-hover{ class: css_class, data: { toggle: 'tooltip', placement: 'bottom', html: 'true', title: mr_status_tooltip } } - = sprite_icon(mr_status_icon, size: 16, css_class: "merge-request-status #{mr_status_class}") |