diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-09-27 20:33:16 +0000 |
---|---|---|
committer | Ruben Davila <rdavila84@gmail.com> | 2016-09-28 10:28:37 -0500 |
commit | 26f12560073ca5ba999bea77a905e751c597337d (patch) | |
tree | b223e51d083f45374a3f68fcc6ebb5d2ccfbf54d /app | |
parent | 05d85a81d31a816751e3bfd4f79dc2876e32c4b9 (diff) | |
download | gitlab-ce-26f12560073ca5ba999bea77a905e751c597337d.tar.gz |
Merge branch '22472-wrong-table-head' into 'master'
Fix pipelines table headers
## What does this MR do?
Removed stages loop for a single 'Stages' header.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
The headers were messing the table up. Note the redundant headers and squished cells.
![Screen_Shot_2016-09-27_at_14.40.51](/uploads/331b08c30a4af59cefc460ab4f3c2a61/Screen_Shot_2016-09-27_at_14.40.51.png)
## Screenshots (if relevant)
![Screen_Shot_2016-09-27_at_14.39.04](/uploads/687895e9152d4fe8d8f3bfc1233af39b/Screen_Shot_2016-09-27_at_14.39.04.png)
## Does this MR meet the acceptance criteria?
- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #22472
See merge request !6542
Diffstat (limited to 'app')
-rw-r--r-- | app/views/projects/commit/_pipelines_list.haml | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/app/views/projects/commit/_pipelines_list.haml b/app/views/projects/commit/_pipelines_list.haml index f41a11a056d..95a8c7b4a5d 100644 --- a/app/views/projects/commit/_pipelines_list.haml +++ b/app/views/projects/commit/_pipelines_list.haml @@ -8,13 +8,7 @@ %tbody %th Status %th Commit - - pipelines.stages.each do |stage| - %th.stage - - if stage.titleize.length > 12 - %span.has-tooltip{ title: "#{stage.titleize}" } - = stage.titleize - - else - = stage.titleize + %th Stages %th %th = render pipelines, commit_sha: true, stage: true, allow_retry: true, stages: pipelines.stages, status_icon_only: true, hide_branch: true |