diff options
author | Adam Niedzielski <adamsunday@gmail.com> | 2016-11-29 00:08:11 +0100 |
---|---|---|
committer | Adam Niedzielski <adamsunday@gmail.com> | 2016-11-29 00:08:11 +0100 |
commit | 7de6aee7556d53ec1b327bd6d0cb40fbd3848592 (patch) | |
tree | ec85a1ac0548f5d5594026f95f974d3c0952b9cb | |
parent | d90d822dd3430ca8fcabcfb56f5030db86ec85a5 (diff) | |
download | gitlab-ce-25055-pipelines-info-missing-from-mr-widget.tar.gz |
Fix pipelines info being hidden in merge request widget25055-pipelines-info-missing-from-mr-widget
We do need these "ci-#{status}" classes because we use them in
MergeRequestWidget to show correct divs.
-rw-r--r-- | app/views/projects/merge_requests/widget/_heading.html.haml | 2 | ||||
-rw-r--r-- | changelogs/unreleased/25055-pipelines-info-missing-from-mr-widget.yml | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/widget/_heading.html.haml b/app/views/projects/merge_requests/widget/_heading.html.haml index 18c72ed875c..6d9b91ad0e7 100644 --- a/app/views/projects/merge_requests/widget/_heading.html.haml +++ b/app/views/projects/merge_requests/widget/_heading.html.haml @@ -1,7 +1,7 @@ - if @pipeline .mr-widget-heading - %w[success success_with_warnings skipped canceled failed running pending].each do |status| - .ci_widget{ class: "ci-status-icon-#{status}", style: ("display:none" unless @pipeline.status == status) } + .ci_widget{ class: "ci-#{status} ci-status-icon-#{status}", style: ("display:none" unless @pipeline.status == status) } = ci_icon_for_status(status) %span Pipeline diff --git a/changelogs/unreleased/25055-pipelines-info-missing-from-mr-widget.yml b/changelogs/unreleased/25055-pipelines-info-missing-from-mr-widget.yml new file mode 100644 index 00000000000..dad9db0ffef --- /dev/null +++ b/changelogs/unreleased/25055-pipelines-info-missing-from-mr-widget.yml @@ -0,0 +1,4 @@ +--- +title: Fix pipelines info being hidden in merge request widget +merge_request: 7808 +author: |