diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-11-29 17:11:02 +0000 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-11-29 17:11:02 +0000 |
commit | 25e6e2fc73c476bdef8465975165894ac01da991 (patch) | |
tree | 8d50c26eeb89fbaf32ad29e6c24898533a620072 | |
parent | a7a3636de2a82b34cf057207bd3ad419f3964b7e (diff) | |
parent | 7de6aee7556d53ec1b327bd6d0cb40fbd3848592 (diff) | |
download | gitlab-ce-25e6e2fc73c476bdef8465975165894ac01da991.tar.gz |
Merge branch '25055-pipelines-info-missing-from-mr-widget' into 'master'
Fix pipelines info being hidden in merge request widget
## What does this MR do?
Reintroduces CSS classes that are necessary for `MergeRequestWidget` to show correct divs.
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- ~~[ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~
- ~~[ ] API support added~~
- Tests
- ~~[ ] Added for this feature/bug~~
- [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #25055
See merge request !7808
-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: |