diff options
| author | André Luís <aluis@gitlab.com> | 2018-03-17 19:28:03 +0000 |
|---|---|---|
| committer | Mayra Cabrera <mcabrera@gitlab.com> | 2018-03-22 15:18:47 -0600 |
| commit | a1a01da9a4dfc2c64c98de567842091b256092bc (patch) | |
| tree | 0a59430a6c3c62ee670eb7f5213973c3a91c9a42 | |
| parent | ee30b954c7918f09472f1e11c12ce7e5f6ca28fd (diff) | |
| download | gitlab-ce-a1a01da9a4dfc2c64c98de567842091b256092bc.tar.gz | |
Unify retry information in tooltip of job status
| -rw-r--r-- | app/views/projects/jobs/_sidebar.html.haml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/views/projects/jobs/_sidebar.html.haml b/app/views/projects/jobs/_sidebar.html.haml index 2322548218a..4aa29f8067e 100644 --- a/app/views/projects/jobs/_sidebar.html.haml +++ b/app/views/projects/jobs/_sidebar.html.haml @@ -91,7 +91,9 @@ - HasStatus::ORDERED_STATUSES.each do |build_status| - builds.select{|build| build.status == build_status}.each do |build| .build-job{ class: sidebar_build_class(build, @build), data: { stage: build.stage } } - = link_to(project_job_path(@project, build), data: { toggle: 'tooltip', html: true, title: tooltip_for_badge(build, build.detailed_status(current_user)), container: 'body' }) do + - tooltip = tooltip_for_badge(build, build.detailed_status(current_user)) + - tooltip += " (retried)" if build.retried? + = link_to(project_job_path(@project, build), data: { toggle: 'tooltip', html: true, title: tooltip, container: 'body' }) do = sprite_icon('arrow-right', size:16, css_class: 'icon-arrow-right') %span{ class: "ci-status-icon-#{build.status}" } = ci_icon_for_status(build.status) @@ -101,5 +103,4 @@ - else = build.id - if build.retried? - %span.has-tooltip{ data: { container: 'body', placement: 'bottom' }, title: 'Job was retried' } - = sprite_icon('retry', size:16, css_class: 'icon-retry') + = sprite_icon('retry', size:16, css_class: 'icon-retry') |