Commit cc175278 authored by Tim Zallmann's avatar Tim Zallmann

Merge branch '39878-commit-pipeline-reads-wrong-key' into 'master'

Fix commit pipeline showing wrong status

Closes #39878

See merge request gitlab-org/gitlab-ce!15238
parents a3e1cb81 091f6387
......@@ -67,7 +67,7 @@
- if @commit.last_pipeline
- last_pipeline = @commit.last_pipeline
.well-segment.pipeline-info
.status-icon-container{ class: "ci-status-icon-#{@commit.status}" }
.status-icon-container{ class: "ci-status-icon-#{last_pipeline.status}" }
= link_to project_pipeline_path(@project, last_pipeline.id) do
= ci_icon_for_status(last_pipeline.status)
#{ _('Pipeline') }
......
---
title: Fix commit pipeline showing wrong status
merge_request:
author:
type: fixed
......@@ -12,6 +12,13 @@ feature 'Mini Pipeline Graph in Commit View', :js do
end
let(:build) { create(:ci_build, pipeline: pipeline) }
it 'display icon with status' do
build.run
visit project_commit_path(project, project.commit.id)
expect(page).to have_selector('.ci-status-icon-running')
end
it 'displays a mini pipeline graph' do
build.run
visit project_commit_path(project, project.commit.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