diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-14 12:08:58 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-14 12:08:58 +0000 |
| commit | c9ca178ba4c9a3e48d9d069f7d7486a29827cc61 (patch) | |
| tree | 07a4f84921b80ff967d30229f0d887c152b9b1d8 /app/views/projects/ci/builds | |
| parent | 6035fcc36ead3b415fa2422b0204a795a70f3e2f (diff) | |
| download | gitlab-ce-c9ca178ba4c9a3e48d9d069f7d7486a29827cc61.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/ci/builds')
| -rw-r--r-- | app/views/projects/ci/builds/_build.html.haml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml index b01665daff4..138f5569218 100644 --- a/app/views/projects/ci/builds/_build.html.haml +++ b/app/views/projects/ci/builds/_build.html.haml @@ -22,7 +22,7 @@ - if ref - if job.ref .icon-container.gl-display-inline-block - = job.tag? ? icon('tag') : sprite_icon('fork', css_class: 'sprite') + = job.tag? ? sprite_icon('label', css_class: 'sprite') : sprite_icon('fork', css_class: 'sprite') = link_to job.ref, project_ref_path(job.project, job.ref), class: "ref-name" - else .light= _('none') @@ -33,10 +33,12 @@ = link_to job.short_sha, project_commit_path(job.project, job.sha), class: "commit-sha mr-0" - if job.stuck? - = icon('warning', class: 'text-warning has-tooltip', title: _('Job is stuck. Check runners.')) + %span.has-tooltip{ title: _('Job is stuck. Check runners.') } + = sprite_icon('warning', css_class: 'text-warning!') - if retried - = icon('refresh', class: 'text-warning has-tooltip', title: _('Job was retried')) + %span.has-tooltip{ title: _('Job was retried') } + = sprite_icon('retry', css_class: 'text-warning') .label-container - if job.tags.any? @@ -87,7 +89,7 @@ - if job.finished_at %p.finished-at - = icon("calendar") + = sprite_icon("calendar") %span= time_ago_with_tooltip(job.finished_at) %td.coverage |