diff options
| author | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-04-25 15:02:15 -0500 |
|---|---|---|
| committer | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-05-04 16:45:37 -0500 |
| commit | 7878eb9fa69123981281c2d71a2964dca1b459ee (patch) | |
| tree | beb9b1a4020a6313e209ace1b0d075d56bfc03b2 /app/views/admin/builds | |
| parent | 950ab1e8470011bda4a2c481fc73e12df391dddf (diff) | |
| download | gitlab-ce-7878eb9fa69123981281c2d71a2964dca1b459ee.tar.gz | |
Start builds redesign
Diffstat (limited to 'app/views/admin/builds')
| -rw-r--r-- | app/views/admin/builds/_build.html.haml | 20 | ||||
| -rw-r--r-- | app/views/admin/builds/index.html.haml | 3 |
2 files changed, 12 insertions, 11 deletions
diff --git a/app/views/admin/builds/_build.html.haml b/app/views/admin/builds/_build.html.haml index 3571eefd570..84b78a6f36a 100644 --- a/app/views/admin/builds/_build.html.haml +++ b/app/views/admin/builds/_build.html.haml @@ -35,15 +35,15 @@ %td #{build.stage} / #{build.name} - .pull-right - - if build.tags.any? - - build.tags.each do |tag| - %span.label.label-primary - = tag - - if build.try(:trigger_request) - %span.label.label-info triggered - - if build.try(:allow_failure) - %span.label.label-danger allowed to fail + %td + - if build.tags.any? + - build.tags.each do |tag| + %span.label.label-primary + = tag + - if build.try(:trigger_request) + %span.label.label-info triggered + - if build.try(:allow_failure) + %span.label.label-danger allowed to fail %td.duration - if build.duration @@ -69,4 +69,4 @@ %i.fa.fa-remove.cred - elsif defined?(allow_retry) && allow_retry && build.retryable? = link_to retry_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Retry' do - %i.fa.fa-repeat + %i.fa.fa-refresh diff --git a/app/views/admin/builds/index.html.haml b/app/views/admin/builds/index.html.haml index 5931efdefe6..804d7851bdb 100644 --- a/app/views/admin/builds/index.html.haml +++ b/app/views/admin/builds/index.html.haml @@ -19,7 +19,7 @@ - if @all_builds.running_or_pending.any? = link_to 'Cancel all', cancel_all_admin_builds_path, data: { confirm: 'Are you sure?' }, class: 'btn btn-danger', method: :post -.gray-content-block.second-block +.row-content-block.second-block #{(@scope || 'running').capitalize} builds %ul.content-list @@ -38,6 +38,7 @@ %th Ref %th Runner %th Name + %th Tags %th Duration %th Finished at %th |