diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-05-03 00:10:17 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-05-03 00:17:53 +0800 |
| commit | e69a7b95df4aea964878086157487379705c9a8c (patch) | |
| tree | 116a6bdda7e83a49c2c24ba6541571e1799d7b2a | |
| parent | 98ae016ab207a7f4e27d151584156af6011d48d5 (diff) | |
| download | gitlab-ce-e69a7b95df4aea964878086157487379705c9a8c.tar.gz | |
Always show latest pipeline info in commit box
| -rw-r--r-- | app/models/commit.rb | 2 | ||||
| -rw-r--r-- | app/views/projects/commit/_commit_box.html.haml | 17 | ||||
| -rw-r--r-- | changelogs/unreleased/always-show-latest-pipeline-in-commit-box.yml | 4 |
3 files changed, 14 insertions, 9 deletions
diff --git a/app/models/commit.rb b/app/models/commit.rb index bb4cb8efd15..e37c2d6bbd6 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -237,7 +237,7 @@ class Commit end def latest_pipeline - pipelines.last + @latest_pipeline ||= pipelines.last end def status(ref = nil) diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml index f604d6e5fbb..7d9a8990591 100644 --- a/app/views/projects/commit/_commit_box.html.haml +++ b/app/views/projects/commit/_commit_box.html.haml @@ -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)}"); diff --git a/changelogs/unreleased/always-show-latest-pipeline-in-commit-box.yml b/changelogs/unreleased/always-show-latest-pipeline-in-commit-box.yml new file mode 100644 index 00000000000..6aa0c89f6f7 --- /dev/null +++ b/changelogs/unreleased/always-show-latest-pipeline-in-commit-box.yml @@ -0,0 +1,4 @@ +--- +title: Always show the latest pipeline information in the commit box +merge_request: 11038 +author: |