Rename RuleDrawer to AccessLevelsDrawer
What does this MR do and why?
This is part of a bigger effort to Create a form to edit squash settings in branch rule.
Context: currently, the drawer that is being used in this view is generically named RuleDrawer
. Now that we'll introduce another drawer to this view, this MR renames to existing drawer to something less generic (i.e. AccessLevelsDrawer
). Eventually we'll end up with two drawer components for this view - AccessLevelsDrawer
and SquashSettingsDrawer
.
Implementation breakdown
description | MR |
---|---|
Rename RuleDrawer to AccessLevelsDrawer
|
![]() |
Create a SquashSettingsDrawer component |
follow-up MR |
Edit squash settings backend/frontend integration | follow-up MR |
MR acceptance checklist
Please evaluate this MR against the MR acceptance checklist. It helps you analyze changes to reduce risks in quality, performance, reliability, security, and maintainability.
Screenshots or screen recordings
No visual changes are expected, editing Branch Rule details should work exactly as it did before.
How to set up and validate locally
- Navigate to Project > Settings > Repository > Branch rules
- Select or create a branch rule
- On the Branch rule details page, editing Allowed to merge and Allowed to push and merge should work just as it did before
Related to #498702 (closed)
Merge request reports
Activity
changed milestone to %17.8
assigned to @jerasmus
added pipelinetier-1 label
1 Warning featureaddition and featureenhancement merge requests normally have a documentation change. Consider adding a documentation update or confirming the documentation plan with the Technical Writer counterpart.
For more information, see:
- The Handbook page on merge request types.
- The definition of done documentation.
2 Messages This merge request includes changes to Vue files that have both CE and EE versions. CHANGELOG missing: If this merge request needs a changelog entry, add the
Changelog
trailer to the commit message you want to add to the changelog.If this merge request doesn't need a CHANGELOG entry, feel free to ignore this message.
Vue
<template>
in CE and EESome Vue files in CE have a counterpart in EE. (For example,
path/to/file.vue
andee/path/to/file.vue
.)When run in the context of CE, the
<template>
of the CE Vue file is used. When run in the context of EE, the<template>
of the EE Vue file is used.It's easy to accidentally make a change to a CE
<template>
that should appear in both CE and EE without making the change in both places. When this happens, the change only takes effect in CE.The following Vue files were changed as part of this merge request that include both a CE and EE version of the file:
app/assets/javascripts/projects/settings/branch_rules/components/view/index.vue
If you made a change to the
<template>
of any of these Vue files that should be visible in both CE and EE, please ensure you have made your change to both versions of the file.A better alternative
An even better alternative is to refactor this component to only use a single template for both CE and EE. More info on this approach here: https://docs.gitlab.com/ee/development/ee_features.html#template-tag
Reviewer roulette
Category Reviewer Maintainer frontend @aalakkad
(UTC+3, 2 hours ahead of author)
@dmishunov
(UTC+1, same timezone as author)
Please refer to documentation page for guidance on how you can benefit from the Reviewer Roulette, or use the GitLab Review Workload Dashboard to find other available reviewers.
If needed, you can retry the
danger-review
job that generated this comment.Generated by
Danger- Resolved by Paulina Sedlak-Jakubowska
@jmontal
could you please review this MR and pass it on to@psjakubowska
for maintainer review?
requested review from @jmontal
requested review from @psjakubowska
added pipeline:mr-approved label
added pipelinetier-2 label and removed pipelinetier-1 label
Before you set this MR to auto-merge
This merge request will progress on pipeline tiers until it reaches the last tier: pipelinetier-3. We will trigger a new pipeline for each transition to a higher tier.
Before you set this MR to auto-merge, please check the following:
- You are the last maintainer of this merge request
- The latest pipeline for this merge request is pipelinetier-3 (You can find which tier it is in the pipeline name)
- This pipeline is recent enough (created in the last 8 hours)
If all the criteria above apply, please set auto-merge for this merge request.
See pipeline tiers and merging a merge request for more details.
Bundle size analysis [beta]
This compares changes in bundle size for entry points between the commits 6bc5e7a7 and a6f2fc23
Special assetsEntrypoint / Name Size before Size after Diff Diff in percent average 4.42 MB 4.41 MB - -0.0 % mainChunk 3.28 MB 3.28 MB - 0.0 %
Note: We do not have exact data for 6bc5e7a7. So we have used data from: 068181d1.
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
Danger- Resolved by Jacques Erasmus
E2E Test Result Summary
allure-report-publisher
generated test report!e2e-test-on-gdk:
test report for a6f2fc23expand test summary
+------------------------------------------------------------------+ | suites summary | +-------------+--------+--------+---------+-------+-------+--------+ | | passed | failed | skipped | flaky | total | result | +-------------+--------+--------+---------+-------+-------+--------+ | Plan | 82 | 0 | 8 | 0 | 90 | ✅ | | Create | 135 | 0 | 20 | 0 | 155 | ✅ | | Govern | 80 | 0 | 12 | 0 | 92 | ✅ | | Configure | 0 | 0 | 3 | 0 | 3 | ➖ | | Verify | 48 | 0 | 17 | 0 | 65 | ✅ | | Package | 25 | 0 | 13 | 0 | 38 | ✅ | | Monitor | 8 | 0 | 12 | 0 | 20 | ✅ | | Data Stores | 33 | 0 | 10 | 0 | 43 | ✅ | | Growth | 0 | 0 | 2 | 0 | 2 | ➖ | | Release | 5 | 0 | 1 | 0 | 6 | ✅ | | Manage | 1 | 0 | 9 | 0 | 10 | ✅ | | Fulfillment | 2 | 0 | 7 | 0 | 9 | ✅ | | Analytics | 2 | 0 | 0 | 0 | 2 | ✅ | | Secure | 4 | 0 | 3 | 0 | 7 | ✅ | | Ai-powered | 0 | 0 | 2 | 0 | 2 | ➖ | | ModelOps | 0 | 0 | 1 | 0 | 1 | ➖ | +-------------+--------+--------+---------+-------+-------+--------+ | Total | 425 | 0 | 120 | 0 | 545 | ✅ | +-------------+--------+--------+---------+-------+-------+--------+
e2e-test-on-cng:
test report for a6f2fc23expand test summary
+------------------------------------------------------------------+ | suites summary | +-------------+--------+--------+---------+-------+-------+--------+ | | passed | failed | skipped | flaky | total | result | +-------------+--------+--------+---------+-------+-------+--------+ | Govern | 84 | 0 | 10 | 0 | 94 | ✅ | | Create | 140 | 0 | 19 | 1 | 159 | ✅ | | Monitor | 8 | 0 | 12 | 0 | 20 | ✅ | | Plan | 86 | 0 | 8 | 0 | 94 | ✅ | | Data Stores | 33 | 0 | 10 | 0 | 43 | ✅ | | Verify | 49 | 0 | 16 | 0 | 65 | ✅ | | Package | 30 | 0 | 14 | 0 | 44 | ✅ | | ModelOps | 0 | 0 | 1 | 0 | 1 | ➖ | | Manage | 1 | 0 | 9 | 0 | 10 | ✅ | | Secure | 2 | 0 | 5 | 0 | 7 | ✅ | | Fulfillment | 2 | 0 | 7 | 0 | 9 | ✅ | | Ai-powered | 0 | 0 | 2 | 0 | 2 | ➖ | | Growth | 0 | 0 | 2 | 0 | 2 | ➖ | | Release | 5 | 0 | 1 | 0 | 6 | ✅ | | Analytics | 2 | 0 | 0 | 0 | 2 | ✅ | | Configure | 0 | 0 | 3 | 0 | 3 | ➖ | +-------------+--------+--------+---------+-------+-------+--------+ | Total | 442 | 0 | 119 | 1 | 561 | ✅ | +-------------+--------+--------+---------+-------+-------+--------+
added pipelinetier-3 pipeline:run-e2e-omnibus-once labels and removed pipelinetier-2 label
added workflowin review label
started a merge train
mentioned in commit 2c01a78e
mentioned in incident gitlab-org/quality/engineering-productivity/master-broken-incidents#9711 (closed)
added workflowstaging-canary label and removed workflowin review 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 workflowpost-deploy-db-production label and removed workflowpost-deploy-db-staging label
mentioned in merge request !176971 (merged)
added releasedcandidate label
added releasedpublished label and removed releasedcandidate label