Always show latest pipeline info in commit box

This commit is contained in:
Lin Jen-Shin 2017-05-03 00:10:17 +08:00
parent 98ae016ab2
commit e69a7b95df
3 changed files with 14 additions and 9 deletions

View File

@ -237,7 +237,7 @@ class Commit
end
def latest_pipeline
pipelines.last
@latest_pipeline ||= pipelines.last
end
def status(ref = nil)

View File

@ -61,19 +61,20 @@
%span.commit-info.branches
%i.fa.fa-spinner.fa-spin
- if @commit.status
- if @commit.latest_pipeline
- latest_pipeline = @commit.latest_pipeline
.well-segment.pipeline-info
.status-icon-container{ class: "ci-status-icon-#{@commit.status}" }
= link_to namespace_project_pipeline_path(@project.namespace, @project, @commit.latest_pipeline.id) do
= ci_icon_for_status(@commit.status)
= link_to namespace_project_pipeline_path(@project.namespace, @project, latest_pipeline.id) do
= ci_icon_for_status(latest_pipeline.status)
Pipeline
= link_to "##{@commit.latest_pipeline.id}", namespace_project_pipeline_path(@project.namespace, @project, @commit.latest_pipeline.id), class: "monospace"
= ci_label_for_status(@commit.status)
- if @commit.latest_pipeline.stages.any?
= link_to "##{latest_pipeline.id}", namespace_project_pipeline_path(@project.namespace, @project, latest_pipeline.id), class: "monospace"
= ci_label_for_status(latest_pipeline.status)
- if latest_pipeline.stages.any?
.mr-widget-pipeline-graph
= render 'shared/mini_pipeline_graph', pipeline: @commit.latest_pipeline, klass: 'js-commit-pipeline-graph'
= render 'shared/mini_pipeline_graph', pipeline: latest_pipeline, klass: 'js-commit-pipeline-graph'
in
= time_interval_in_words @commit.pipelines.total_duration
= time_interval_in_words latest_pipeline.duration
:javascript
$(".commit-info.branches").load("#{branches_namespace_project_commit_path(@project.namespace, @project, @commit.id)}");

View File

@ -0,0 +1,4 @@
---
title: Always show the latest pipeline information in the commit box
merge_request: 11038
author: