diff options
| author | Katarzyna Kobierska <kkobierska@gmail.com> | 2016-09-01 10:02:01 +0200 |
|---|---|---|
| committer | Katarzyna Kobierska <kkobierska@gmail.com> | 2016-09-13 09:05:07 +0200 |
| commit | 0c14eaa6de4ce1c44d98581714b9c99f4e3045be (patch) | |
| tree | d550df0ac26c3624c32a29bfccf88b89662a966a /app | |
| parent | 21976091175598b590f4f9306d812280ba9f4c28 (diff) | |
| download | gitlab-ce-0c14eaa6de4ce1c44d98581714b9c99f4e3045be.tar.gz | |
Liken admin and project builds views to each other
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/admin/builds/_build.html.haml | 9 | ||||
| -rw-r--r-- | app/views/projects/builds/_content_list.html.haml | 58 | ||||
| -rw-r--r-- | app/views/projects/ci/builds/_build.html.haml | 7 |
3 files changed, 31 insertions, 43 deletions
diff --git a/app/views/admin/builds/_build.html.haml b/app/views/admin/builds/_build.html.haml index f29d9c94441..3e868256366 100644 --- a/app/views/admin/builds/_build.html.haml +++ b/app/views/admin/builds/_build.html.haml @@ -45,7 +45,10 @@ .light none %td - #{build.stage} / #{build.name} + #{build.stage} + + %td + #{build.name} %td - if build.duration @@ -58,8 +61,8 @@ = icon("calendar") %span #{time_ago_with_tooltip(build.finished_at)} - - if defined?(coverage) && coverage - %td.coverage + %td.coverage + - if defined?(coverage) && coverage - if build.try(:coverage) #{build.coverage}% diff --git a/app/views/projects/builds/_content_list.html.haml b/app/views/projects/builds/_content_list.html.haml index 93283edc2e1..b59599595dd 100644 --- a/app/views/projects/builds/_content_list.html.haml +++ b/app/views/projects/builds/_content_list.html.haml @@ -1,43 +1,29 @@ -- if project.nil? - - if builds.blank? - %li - .nothing-here-block No builds to show - - else - .table-holder - %table.table.builds - %thead - %tr - %th Status - %th Commit +- if builds.blank? + %li + .nothing-here-block No builds to show +- else + .table-holder + %table.table.builds + %thead + %tr + %th Status + %th Commit + - if project.nil? %th Project %th Runner - %th Name - %th - %th + %th Stage + %th Name + %th + %th + - if project.present? + - if @project.build_coverage_enabled? + %th Coverage + + - if project.nil? - builds.each do |build| = render "admin/builds/build", build: build - - = paginate builds, theme: 'gitlab' - -- if project.present? - - if builds.blank? - %li - .nothing-here-block No builds to show - - else - .table-holder - %table.table.builds - %thead - %tr - %th Status - %th Commit - %th Stage - %th Name - %th - - if project.build_coverage_enabled? - %th Coverage - %th - + - else = render builds, commit_sha: true, ref: true, stage: true, allow_retry: true, coverage: project.build_coverage_enabled? - = paginate builds, theme: 'gitlab' + = paginate builds, theme: 'gitlab' diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml index 73de8abe55b..68c938d67d5 100644 --- a/app/views/projects/ci/builds/_build.html.haml +++ b/app/views/projects/ci/builds/_build.html.haml @@ -52,12 +52,11 @@ - else .light none - - if defined?(stage) && stage - %td - = build.stage + %td + #{build.stage} %td - = build.name + #{build.name} %td - if build.duration |