Commit 99f36c2c authored by Kamil Trzciński's avatar Kamil Trzciński

Merge branch '32103-last-scheduled-pipeline-link-only-showing-ci-status-icon' into 'master'

Adds pipeline id to 'Last Pipeline' link in pipeline schedules

Closes #32103

See merge request !11258
parents 592263ea a9ec2427
......@@ -10,6 +10,7 @@
.status-icon-container{ class: "ci-status-icon-#{pipeline_schedule.last_pipeline.status}" }
= link_to namespace_project_pipeline_path(@project.namespace, @project, pipeline_schedule.last_pipeline.id) do
= ci_icon_for_status(pipeline_schedule.last_pipeline.status)
%span ##{pipeline_schedule.last_pipeline.id}
- else
None
%td.next-run-cell
......
......@@ -6,6 +6,7 @@ feature 'Pipeline Schedules', :feature do
let!(:project) { create(:project) }
let!(:pipeline_schedule) { create(:ci_pipeline_schedule, project: project) }
let!(:pipeline) { create(:ci_pipeline, pipeline_schedule: pipeline_schedule) }
let(:scope) { nil }
let!(:user) { create(:user) }
......@@ -32,7 +33,7 @@ feature 'Pipeline Schedules', :feature do
page.within('.pipeline-schedule-table-row') do
expect(page).to have_content('pipeline schedule')
expect(page).to have_link('master')
expect(page).to have_content('None')
expect(page).to have_link("##{pipeline.id}")
end
end
......
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