Build path with call

2 files changed, 4 insertions, 105 deletions

diff --git a/app/views/shared/builds/_build.html.haml b/app/views/shared/builds/_build.html.haml
deleted file mode 100644
index a5f38d0ce95..00000000000
--- a/app/views/shared/builds/_build.html.haml
+++ /dev/null
@@ -1,101 +0,0 @@
-- admin = false unless admin
-- if admin
-  - project = build.project
-
-%tr.build.commit
-  %td.status
-    - if can?(current_user, :read_build, build)
-      = ci_status_with_icon(build.status, namespace_project_build_url(build.project.namespace, build.project, build))
-    - else
-      = ci_status_with_icon(build.status)
-
-  %td
-    .branch-commit
-      - if can?(current_user, :read_build, build)
-        = link_to namespace_project_build_url(build.project.namespace, build.project, build) do
-          %span.build-link ##{build.id}
-      - else
-        %span.build-link ##{build.id}
-
-      - if defined?(ref) && ref
-        - if build.ref
-          .icon-container
-            = build.tag? ? icon('tag') : icon('code-fork')
-          = link_to build.ref, namespace_project_commits_path(build.project.namespace, build.project, build.ref), class: "monospace branch-name"
-        - else
-          .light none
-        .icon-container
-          = custom_icon("icon_commit")
-
-      - 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|
-            %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
-        - if defined?(retried) && retried
-          %span.label.label-warning retried
-        - if build.manual?
-          %span.label.label-info manual
-
-  - if admin
-    %td
-      - if project
-        = link_to project.name_with_namespace, admin_namespace_project_path(project.namespace, project)
-
-  - if defined?(runner) && runner
-    %td
-      - if build.try(:runner)
-        = runner_link(build.runner)
-      - else
-        .light none
-
-  %td
-    = build.stage
-
-  %td
-    = build.name
-
-  %td
-    - if build.duration
-      %p.duration
-        = custom_icon("icon_timer")
-        = duration_in_numbers(build.duration)
-
-    - if build.finished_at
-      %p.finished-at
-        = icon("calendar")
-        %span #{time_ago_with_tooltip(build.finished_at)}
-
-  %td.coverage
-    - if defined?(coverage) && coverage
-      - if build.try(:coverage)
-        #{build.coverage}%
-
-  %td
-    .pull-right
-      - if can?(current_user, :read_build, build) && build.artifacts?
-        = link_to download_namespace_project_build_artifacts_path(build.project.namespace, build.project, build), title: 'Download artifacts', class: 'btn btn-build' do
-          = icon('download')
-      - if can?(current_user, :update_build, build)
-        - if build.active?
-          = link_to cancel_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Cancel', class: 'btn btn-build' do
-            = icon('remove', class: 'cred')
-        - elsif defined?(allow_retry) && allow_retry
-          - if build.retryable?
-            = link_to retry_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Retry', class: 'btn btn-build' do
-              = icon('repeat')
-          - elsif build.playable? && !admin
-            = link_to play_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Play', class: 'btn btn-build' do
-              = custom_icon('icon_play')
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))