diff options
author | Katarzyna Kobierska <kkobierska@gmail.com> | 2016-09-08 11:06:29 +0300 |
---|---|---|
committer | Katarzyna Kobierska <kkobierska@gmail.com> | 2016-09-13 10:05:07 +0300 |
commit | f341d95703f4268e176f02aa9d923e7f2069d5c4 (patch) | |
tree | eb3425881b9fa78e994c95721a0be83ddb8eb1ba /app | |
parent | 80c86bcc5b778306825e7650ccaa3c01bfd75ac0 (diff) |
Build path with call
Diffstat (limited to 'app')
-rw-r--r-- | app/views/projects/builds/_table.html.haml | 4 | ||||
-rw-r--r-- | app/views/projects/ci/builds/_build.html.haml (renamed from app/views/shared/builds/_build.html.haml) | 0 | ||||
-rw-r--r-- | app/views/shared/_builds_tabs.html.haml | 24 | ||||
-rw-r--r-- | app/views/shared/builds/_tabs.html.haml | 8 |
4 files changed, 6 insertions, 30 deletions
diff --git a/app/views/projects/builds/_table.html.haml b/app/views/projects/builds/_table.html.haml index a4cd9596d68..da43dbb8d81 100644 --- a/app/views/projects/builds/_table.html.haml +++ b/app/views/projects/builds/_table.html.haml @@ -21,8 +21,8 @@ %th - if admin - = render partial: "shared/builds/build", collection: builds, as: :build, locals: { commit_sha: true, ref: true, stage: true, allow_retry: true, runner: true, admin: true } + = render partial: "projects/ci/builds/build", collection: builds, as: :build, locals: { commit_sha: true, ref: true, stage: true, allow_retry: true, runner: true, admin: true } - else - = render partial: "shared/builds/build", collection: builds, as: :build, locals: {commit_sha: true, ref: true, stage: true, allow_retry: true, coverage: project.build_coverage_enabled? } + = render partial: "projects/ci/builds/build", collection: builds, as: :build, locals: {commit_sha: true, ref: true, stage: true, allow_retry: true, coverage: project.build_coverage_enabled? } = paginate builds, theme: 'gitlab' diff --git a/app/views/shared/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml index a5f38d0ce95..a5f38d0ce95 100644 --- a/app/views/shared/builds/_build.html.haml +++ b/app/views/projects/ci/builds/_build.html.haml diff --git a/app/views/shared/_builds_tabs.html.haml b/app/views/shared/_builds_tabs.html.haml deleted file mode 100644 index 9c3173f7a1a..00000000000 --- a/app/views/shared/_builds_tabs.html.haml +++ /dev/null @@ -1,24 +0,0 @@ -%ul.nav-links - %li{class: ('active' if scope.nil?)} - = link_to build_path[nil] do - All - %span.badge.js-totalbuilds-count - = number_with_delimiter(all_builds.count(:id)) - - %li{class: ('active' if scope == 'pending')} - = link_to build_path[:pending] do - Pending - %span.badge - = number_with_delimiter(all_builds.pending.count(:id)) - - %li{class: ('active' if scope == 'running')} - = link_to build_path[:running] do - Running - %span.badge - = number_with_delimiter(all_builds.running.count(:id)) - - %li{class: ('active' if scope == 'finished')} - = link_to build_path[:finished] do - Finished - %span.badge - = number_with_delimiter(all_builds.finished.count(:id)) diff --git a/app/views/shared/builds/_tabs.html.haml b/app/views/shared/builds/_tabs.html.haml index 9c3173f7a1a..398ccf480d9 100644 --- a/app/views/shared/builds/_tabs.html.haml +++ b/app/views/shared/builds/_tabs.html.haml @@ -1,24 +1,24 @@ %ul.nav-links %li{class: ('active' if scope.nil?)} - = link_to build_path[nil] do + = link_to build_path.call(nil) do All %span.badge.js-totalbuilds-count = number_with_delimiter(all_builds.count(:id)) %li{class: ('active' if scope == 'pending')} - = link_to build_path[:pending] do + = link_to build_path.call('pending') do Pending %span.badge = number_with_delimiter(all_builds.pending.count(:id)) %li{class: ('active' if scope == 'running')} - = link_to build_path[:running] do + = link_to build_path.call('running') do Running %span.badge = number_with_delimiter(all_builds.running.count(:id)) %li{class: ('active' if scope == 'finished')} - = link_to build_path[:finished] do + = link_to build_path.call('finished') do Finished %span.badge = number_with_delimiter(all_builds.finished.count(:id)) |