diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-02-05 22:15:32 +0300 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-02-05 22:15:32 +0300 |
| commit | 170ca8435a6b881231476b372122cf7e5b028736 (patch) | |
| tree | b3c762ef01268462b0b674b2d7f353e2a3a6cf48 /app/views/admin/builds | |
| parent | a7c441aa17ba64eb702b583ac9198cdace599d2e (diff) | |
| parent | 3a98279243e7a49a334c7eb6f806cd2b2072fbed (diff) | |
Merge branch 'master' into ci-permissions
# Conflicts:
# db/schema.rb
Diffstat (limited to 'app/views/admin/builds')
| -rw-r--r-- | app/views/admin/builds/index.html.haml | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/app/views/admin/builds/index.html.haml b/app/views/admin/builds/index.html.haml index ebf2b7b60e7..5931efdefe6 100644 --- a/app/views/admin/builds/index.html.haml +++ b/app/views/admin/builds/index.html.haml @@ -1,9 +1,4 @@ -.project-issuable-filter - .controls - .pull-left.hidden-xs - - 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 - +.top-area %ul.nav-links %li{class: ('active' if @scope.nil?)} = link_to admin_builds_path do @@ -20,7 +15,11 @@ Finished %span.badge.js-running-count= number_with_delimiter(@all_builds.finished.count(:id)) -.gray-content-block + .nav-controls + - 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 #{(@scope || 'running').capitalize} builds %ul.content-list |