diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-08-01 18:22:50 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-08-01 18:22:50 +0300 |
| commit | 6c61f244dd8bc49b95780885e467aba64d28af8a (patch) | |
| tree | 5557fd71d70e4248b403d77354df8147be49d2b5 /app/views/projects/ci | |
| parent | ab3dd9a106787b70c26e55e9f0dc7fe6c34b0769 (diff) | |
| parent | cebda439ea88d9868902120b1d20ff304610d9fd (diff) | |
Merge branch 'admin-builds' into 'master'
Pipelines/Builds updates
## What does this MR do?
Adds branch/tag icons in admin view; increase min-width of builds tables
## What are the relevant issue numbers?
#20139
## Screenshots (if relevant)
Branch icons:
Reduce `icon-container` width, before:
Reduce `icon-container` width, after:
See merge request !5527
Diffstat (limited to 'app/views/projects/ci')
| -rw-r--r-- | app/views/projects/ci/builds/_build.html.haml | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml index a3114771a42..91081435220 100644 --- a/app/views/projects/ci/builds/_build.html.haml +++ b/app/views/projects/ci/builds/_build.html.haml @@ -13,13 +13,6 @@ - else %span ##{build.id} - - if build.stuck? - .icon-container - = icon('warning', class: 'text-warning has-tooltip', title: 'Build is stuck. Check runners.') - - if defined?(retried) && retried - .icon-container - = icon('warning', class: 'text-warning has-tooltip', title: 'Build was retried.') - - if defined?(ref) && ref - if build.ref .icon-container @@ -33,6 +26,11 @@ - if defined?(commit_sha) && commit_sha = link_to build.short_sha, namespace_project_commit_path(build.project.namespace, build.project, build.sha), class: "commit-id monospace" + - if build.stuck? + = icon('warning', class: 'text-warning has-tooltip', title: 'Build is stuck. Check runners.') + - if defined?(retried) && retried + = icon('warning', class: 'text-warning has-tooltip', title: 'Build was retried.') + .label-container - if build.tags.any? - build.tags.each do |tag| @@ -47,7 +45,6 @@ - if build.manual? %span.label.label-info manual - - if defined?(runner) && runner %td - if build.try(:runner) |