Commit f47de1da authored by Mike Greiling's avatar Mike Greiling

only display link to pipeline in generic build index, not on pipeline show

parent 942de350
...@@ -20,6 +20,6 @@ ...@@ -20,6 +20,6 @@
%th Coverage %th Coverage
%th %th
= render partial: "projects/ci/builds/build", collection: builds, as: :build, locals: { commit_sha: true, ref: true, stage: true, allow_retry: true, coverage: admin || project.build_coverage_enabled?, admin: admin } = render partial: "projects/ci/builds/build", collection: builds, as: :build, locals: { commit_sha: true, ref: true, pipeline_link: true, stage: true, allow_retry: true, coverage: admin || project.build_coverage_enabled?, admin: admin }
= paginate builds, theme: 'gitlab' = paginate builds, theme: 'gitlab'
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
- ref = local_assigns.fetch(:ref, nil) - ref = local_assigns.fetch(:ref, nil)
- commit_sha = local_assigns.fetch(:commit_sha, nil) - commit_sha = local_assigns.fetch(:commit_sha, nil)
- retried = local_assigns.fetch(:retried, false) - retried = local_assigns.fetch(:retried, false)
- pipeline_link = local_assigns.fetch(:pipeline_link, false)
- stage = local_assigns.fetch(:stage, false) - stage = local_assigns.fetch(:stage, false)
- coverage = local_assigns.fetch(:coverage, false) - coverage = local_assigns.fetch(:coverage, false)
- allow_retry = local_assigns.fetch(:allow_retry, false) - allow_retry = local_assigns.fetch(:allow_retry, false)
...@@ -51,6 +52,7 @@ ...@@ -51,6 +52,7 @@
- if build.manual? - if build.manual?
%span.label.label-info manual %span.label.label-info manual
- if pipeline_link
%td %td
= link_to pipeline_path(build.pipeline) do = link_to pipeline_path(build.pipeline) do
%span.pipeline-id ##{build.pipeline.id} %span.pipeline-id ##{build.pipeline.id}
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
- if stage - if stage
   
= stage.titleize = stage.titleize
= render statuses.latest_ci_stages, coverage: @project.build_coverage_enabled?, stage: false, ref: false, allow_retry: true = render statuses.latest_ci_stages, coverage: @project.build_coverage_enabled?, stage: false, ref: false, pipeline_link: false, allow_retry: true
= render statuses.retried_ci_stages, coverage: @project.build_coverage_enabled?, stage: false, ref: false, retried: true = render statuses.retried_ci_stages, coverage: @project.build_coverage_enabled?, stage: false, ref: false, pipeline_link: false, retried: true
%tr %tr
%td{colspan: 10} %td{colspan: 10}
   
...@@ -61,7 +61,6 @@ ...@@ -61,7 +61,6 @@
%tr %tr
%th Status %th Status
%th Build ID %th Build ID
%th Pipeline
%th Name %th Name
%th %th
- if pipeline.project.build_coverage_enabled? - if pipeline.project.build_coverage_enabled?
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
- if defined?(retried) && retried - if defined?(retried) && retried
= icon('warning', class: 'text-warning has-tooltip', title: 'Status was retried.') = icon('warning', class: 'text-warning has-tooltip', title: 'Status was retried.')
- if defined?(pipeline_link) && pipeline_link
%td %td
= link_to pipeline_path(generic_commit_status.pipeline) do = link_to pipeline_path(generic_commit_status.pipeline) do
%span.pipeline-id ##{generic_commit_status.pipeline.id} %span.pipeline-id ##{generic_commit_status.pipeline.id}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment