From 71cc5de594e4a8657ae1465e6e261ec09898b95b Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Gray Date: Fri, 10 Feb 2017 09:49:17 -0600 Subject: [PATCH 1/2] Only show MR widget graph if there are stages --- app/views/projects/merge_requests/widget/_heading.html.haml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/projects/merge_requests/widget/_heading.html.haml b/app/views/projects/merge_requests/widget/_heading.html.haml index bef76f16ca7..e3062f47788 100644 --- a/app/views/projects/merge_requests/widget/_heading.html.haml +++ b/app/views/projects/merge_requests/widget/_heading.html.haml @@ -9,8 +9,9 @@ Pipeline = link_to "##{@pipeline.id}", namespace_project_pipeline_path(@pipeline.project.namespace, @pipeline.project, @pipeline.id), class: 'pipeline' = ci_label_for_status(status) - .mr-widget-pipeline-graph - = render 'shared/mini_pipeline_graph', pipeline: @pipeline, klass: 'js-pipeline-inline-mr-widget-graph' + - if @pipeline.stages.any? + .mr-widget-pipeline-graph + = render 'shared/mini_pipeline_graph', pipeline: @pipeline, klass: 'js-pipeline-inline-mr-widget-graph' %span for = succeed "." do From ce9a9b67aa7a33b63c55a237bdb276a7294052b1 Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Gray Date: Fri, 10 Feb 2017 10:03:38 -0600 Subject: [PATCH 2/2] Add changelog --- changelogs/unreleased/27987-skipped-pipeline-mr-graph.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 changelogs/unreleased/27987-skipped-pipeline-mr-graph.yml diff --git a/changelogs/unreleased/27987-skipped-pipeline-mr-graph.yml b/changelogs/unreleased/27987-skipped-pipeline-mr-graph.yml new file mode 100644 index 00000000000..e4287d6276c --- /dev/null +++ b/changelogs/unreleased/27987-skipped-pipeline-mr-graph.yml @@ -0,0 +1,4 @@ +--- +title: Show pipeline graph in MR widget if there are any stages +merge_request: +author: