diff options
| author | Constance Okoghenun <constanceokoghenun@gmail.com> | 2019-02-08 08:37:07 +0100 |
|---|---|---|
| committer | Constance Okoghenun <constanceokoghenun@gmail.com> | 2019-02-08 08:37:07 +0100 |
| commit | b177d5233b63177a2c52289183f3693f19561ec1 (patch) | |
| tree | 333614bbafef694a4a47dc65ebac6a72a023ce2f | |
| parent | 724e904c3d4562bf3f1cee6abae1370e20e5ff58 (diff) | |
| download | gitlab-ce-b177d5233b63177a2c52289183f3693f19561ec1.tar.gz | |
Checking MR status date for related MR status tooltip
Changed related MR status tooltip content when MR status date
is not available.
| -rw-r--r-- | app/views/projects/issues/_merge_requests_status.html.haml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/views/projects/issues/_merge_requests_status.html.haml b/app/views/projects/issues/_merge_requests_status.html.haml index 43e4c8db93f..90838a75214 100644 --- a/app/views/projects/issues/_merge_requests_status.html.haml +++ b/app/views/projects/issues/_merge_requests_status.html.haml @@ -12,11 +12,14 @@ - mr_status_class = 'closed' - else - mr_status_date = merge_request.created_at - - mr_status_title = _('Opened') + - mr_status_title = mr_status_date ? _('Opened') : _('Open') - mr_status_icon = 'issue-open-m' - mr_status_class = 'open' -- 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>" +- 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}") |