Branches list improvements
What does this MR do and why?
Updates the list design to use the updated card design.
Screenshots or screen recordings
Before | After |
---|---|
![]() |
![]() |
How to set up and validate locally
MR acceptance checklist
This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.
-
I have evaluated the MR acceptance checklist for this MR.
Merge request reports
Activity
changed milestone to %16.0
added UX UX Paper Cuts frontend groupux paper cuts maintenanceusability sectiondev severity4 typemaintenance + 1 deleted label
assigned to @seggenberger
requested review from @annabeldunstone
- Resolved by Andrew Fontaine
FYI @mle
Edited by Sascha Eggenberger@seggenberger Why is there a gray background to all of the branches?
added docs-only label
- A deleted user
added backend label
2 Warnings This merge request contains lines with QA selectors. Please ensure e2e:package-and-test
job is run.You've made some app changes, but didn't add any tests.
That's OK as long as you're refactoring existing code,
but please consider adding any of the maintenancepipelines, maintenancerefactor, maintenanceworkflow, documentation, QA labels.QA Selectors
The following changed lines in this MR contain QA selectors:
- file
app/views/projects/branches/_branch.html.haml
: - -%li{ class: "branch-item gl-display-flex! gl-align-items-center! js-branch-item js-branch-#{branch.name}", data: { name: branch.name, qa_selector: 'branch_container', qa_name: branch.name } }
-
-
= link_to project_tree_path(@project, branch.name), class: 'item-title str-truncated-100 ref-name gl-ml-3', data: { qa_selector: 'branch_link' } do
-
-
-
= gl_badge_tag s_('DefaultBranchLabel|default'), { variant: :info, size: :sm }, { class: 'gl-ml-2', data: { qa_selector: 'badge_content' } }
-
-
-
= gl_badge_tag s_('Branches|merged'), { variant: :info, size: :sm }, { class: 'gl-ml-2', title: s_('Branches|Merged into %{default_branch}') % { default_branch: @repository.root_ref }, data: { toggle: 'tooltip', container: 'body', qa_selector: 'badge_content' } }
-
-
-
= gl_badge_tag s_('Branches|protected'), { variant: :success, size: :sm }, { class: 'gl-ml-2', data: { qa_selector: 'badge_content' } }
-
- +%li{ class: "branch-item gl-py-3! js-branch-item js-branch-#{branch.name}", data: { name: branch.name, qa_selector: 'branch_container', qa_name: branch.name } }
-
-
= link_to project_tree_path(@project, branch.name), class: 'item-title str-truncated-100 ref-name gl-ml-3', data: { qa_selector: 'branch_link' } do
-
-
-
= gl_badge_tag s_('DefaultBranchLabel|default'), { variant: :info, size: :sm }, { class: 'gl-ml-2', data: { qa_selector: 'badge_content' } }
-
-
-
= gl_badge_tag s_('Branches|merged'), { variant: :info, size: :sm }, { class: 'gl-ml-2', title: s_('Branches|Merged into %{default_branch}') % { default_branch: @repository.root_ref }, data: { toggle: 'tooltip', container: 'body', qa_selector: 'badge_content' } }
-
-
-
= gl_badge_tag s_('Branches|protected'), { variant: :success, size: :sm }, { class: 'gl-ml-2', data: { qa_selector: 'badge_content' } }
-
- file
app/views/projects/branches/_panel.html.haml
: -
- %ul.content-list.all-branches{ data: { qa_selector: 'all_branches_container' } }
-
- %ul.content-list.branches-list.all-branches{ data: { qa_selector: 'all_branches_container' } }
Please ensure
e2e:package-and-test
job is run and the tests are passing.For the list of known failures please refer to the latest pipeline triage issue.
If your changes are under a feature flag, please check our Testing with feature flags documentation for instructions.
Reviewer roulette
Changes that require review have been detected!
Please refer to the table below for assigning reviewers and maintainers suggested by Danger in the specified category:
Category Reviewer Maintainer backend Gregory Havenga (
@ghavenga
) (UTC+2, same timezone as@seggenberger
)Drew Cimino (
@drew
) (UTC+0, 2 hours behind@seggenberger
)frontend Stanislav Lashmanov (
@slashmanov
) (UTC+4, 2 hours ahead of@seggenberger
)Anna Vovchenko (
@anna_vovchenko
) (UTC+3, 1 hour ahead of@seggenberger
)UX Kevin Comoli (
@kcomoli
) (UTC+7, 5 hours ahead of@seggenberger
)Maintainer review is optional for UX To spread load more evenly across eligible reviewers, Danger has picked a candidate for each review slot, based on their timezone. Feel free to override these selections if you think someone else would be better-suited or use the GitLab Review Workload Dashboard to find other available reviewers.
To read more on how to use the reviewer roulette, please take a look at the Engineering workflow and code review guidelines. Please consider assigning a reviewer or maintainer who is a domain expert in the area of the merge request.
Once you've decided who will review this merge request, assign them as a reviewer! Danger does not automatically notify them for you.
If needed, you can retry the
danger-review
job that generated this comment.Generated by
Danger- file
removed docs-only label
- Resolved by Andrew Fontaine
requested review from @arfedoro
Bundle size analysis [beta]
This compares changes in bundle size for entry points between the commits 3754a39e and 9bc059fb
Special assetsEntrypoint / Name Size before Size after Diff Diff in percent average 4.04 MB 4.04 MB - 0.0 % mainChunk 2.89 MB 2.89 MB - 0.0 %
Note: We do not have exact data for 3754a39e. So we have used data from: 08cbd924.
The target commit was too new, so we used the latest commit from master we have info on.
It might help to rerun thebundle-size-review
job
This might mean that you have a few false positives in this report. If something unrelated to your code changes is reported, you can check this comparison in order to see if they caused this change.Please look at the full report for more details
Read more about how this report works.
Generated by
Dangermentioned in merge request !119516 (merged)
Allure report
allure-report-publisher
generated test report!e2e-test-on-gdk:
test report for 9bc059fbexpand test summary
+-----------------------------------------------------------------------+ | suites summary | +------------------+--------+--------+---------+-------+-------+--------+ | | passed | failed | skipped | flaky | total | result | +------------------+--------+--------+---------+-------+-------+--------+ | Monitor | 4 | 0 | 0 | 0 | 4 | ✅ | | Data Stores | 2 | 0 | 0 | 0 | 2 | ✅ | | Plan | 4 | 0 | 0 | 0 | 4 | ✅ | | Manage | 1 | 0 | 0 | 0 | 1 | ✅ | | Create | 8 | 0 | 1 | 0 | 9 | ✅ | | Govern | 2 | 0 | 0 | 0 | 2 | ✅ | | Framework sanity | 0 | 0 | 1 | 0 | 1 | ➖ | +------------------+--------+--------+---------+-------+-------+--------+ | Total | 21 | 0 | 2 | 0 | 23 | ✅ | +------------------+--------+--------+---------+-------+-------+--------+
e2e-review-qa:
test report for 9bc059fbexpand test summary
+-----------------------------------------------------------------------+ | suites summary | +------------------+--------+--------+---------+-------+-------+--------+ | | passed | failed | skipped | flaky | total | result | +------------------+--------+--------+---------+-------+-------+--------+ | Govern | 24 | 0 | 0 | 0 | 24 | ✅ | | Manage | 8 | 0 | 3 | 0 | 11 | ✅ | | Plan | 50 | 0 | 1 | 0 | 51 | ✅ | | Data Stores | 22 | 0 | 0 | 0 | 22 | ✅ | | Framework sanity | 9 | 0 | 1 | 0 | 10 | ✅ | | Create | 27 | 0 | 1 | 0 | 28 | ✅ | | Monitor | 4 | 0 | 0 | 0 | 4 | ✅ | | Verify | 10 | 0 | 0 | 0 | 10 | ✅ | | Package | 0 | 0 | 1 | 0 | 1 | ➖ | +------------------+--------+--------+---------+-------+-------+--------+ | Total | 154 | 0 | 7 | 0 | 161 | ✅ | +------------------+--------+--------+---------+-------+-------+--------+
removed review request for @annabeldunstone
@annabeldunstone
, thanks for approving this merge request.This is the first time the merge request is approved. To ensure full test coverage, a new pipeline will be started shortly.
For more info, please refer to the following links:
added pipeline:mr-approved label
requested review from @afontaine and removed review request for @arfedoro
This looks good to me, thanks @seggenberger
enabled an automatic merge when the pipeline for 825274fe succeeds
mentioned in commit 2d2ee985
added workflowstaging-canary label
added workflowcanary label and removed workflowstaging-canary label
added workflowstaging label and removed workflowcanary label
added workflowproduction label and removed workflowstaging label
added workflowpost-deploy-db-staging label and removed workflowproduction label
added releasedcandidate label
mentioned in merge request kubitus-project/kubitus-installer!2145 (merged)
mentioned in issue #21224