diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-11-22 22:24:21 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-11-22 22:24:21 +0000 |
| commit | 85e6bb8f3ca34fde6db6095976592a2ed8c75139 (patch) | |
| tree | b1a616cbf18e40e98bb980ec2e38a7d09d3ce7b9 | |
| parent | 1fc21ed838fc14401e8acb5bf761bcbf459d9a2c (diff) | |
| parent | aba7f7dd87affaaf8c957a4bf1ce874ccc57f1a4 (diff) | |
| download | gitlab-ce-85e6bb8f3ca34fde6db6095976592a2ed8c75139.tar.gz | |
Merge branch '24739-collapsed-build-list-sorting' into 'master'
Sort pipeline graph builds and build groups by name
## What does this MR do?
Sorts builds and build groups by name within pipeline graphs
## Are there points in the code the reviewer needs to double check?
Shouldn't be. This was a one-line change.
## Why was this MR needed?
It can be difficult to find the build you are looking for within a group of similarly-named builds when they are in a seemingly random order.
## Screenshots (if relevant)
### Before:
### After:
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- Tests
- [ ] 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 #24739
See merge request !7681
| -rw-r--r-- | app/views/projects/commit/_pipeline_stage.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/24739-collapsed-build-list-sorting.yml | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/views/projects/commit/_pipeline_stage.html.haml b/app/views/projects/commit/_pipeline_stage.html.haml index 289aa5178b1..f9a9c8707f5 100644 --- a/app/views/projects/commit/_pipeline_stage.html.haml +++ b/app/views/projects/commit/_pipeline_stage.html.haml @@ -1,4 +1,4 @@ -- status_groups = statuses.group_by(&:group_name) +- status_groups = statuses.sort_by(&:name).group_by(&:group_name) - status_groups.each do |group_name, grouped_statuses| - if grouped_statuses.one? - status = grouped_statuses.first diff --git a/changelogs/unreleased/24739-collapsed-build-list-sorting.yml b/changelogs/unreleased/24739-collapsed-build-list-sorting.yml new file mode 100644 index 00000000000..036e606318f --- /dev/null +++ b/changelogs/unreleased/24739-collapsed-build-list-sorting.yml @@ -0,0 +1,4 @@ +--- +title: Sort builds by name within pipeline graph +merge_request: 7681 +author: |