diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2017-02-10 20:48:24 +0000 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2017-02-10 20:48:24 +0000 |
| commit | 58131ac93c2a7c784c8c4f9025ef250eac4e1fa1 (patch) | |
| tree | 91c205a4d1abd581e071a5b3bfc0c7349f5bf269 | |
| parent | 551ce1d289672cc6f9ed5ce38d0cb6edfb505b8b (diff) | |
| parent | ce9a9b67aa7a33b63c55a237bdb276a7294052b1 (diff) | |
| download | gitlab-ce-58131ac93c2a7c784c8c4f9025ef250eac4e1fa1.tar.gz | |
Merge branch '27987-skipped-pipeline-mr-graph' into 'master'
Only show MR widget graph if there are stages
Closes #27987
See merge request !9141
| -rw-r--r-- | app/views/projects/merge_requests/widget/_heading.html.haml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/27987-skipped-pipeline-mr-graph.yml | 4 |
2 files changed, 7 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 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: |