Add branch_type validations
What does this MR do and why?
This MR adds validation for the new branch_type
that we're adding in &9468 (closed).
The validation is only applied when the feature flag security_policies_branch_type
is enabled.
Screenshots or screen recordings
How to set up and validate locally
Numbered steps to set up and validate the change are strongly suggested.
- In rails console enable the feature flag
Feature.enable(:security_policies_branch_type)
- Go to Settings -> Repository -> Protected branches and unprotect the
main
branch - Add a new scan execution policy with the following yaml:
type: scan_execution_policy name: Pipeline / Protected Branches / Secret Detection description: '' enabled: true rules: - type: pipeline branch_type: protected actions: - scan: secret_detection
- Clicking on
Configure with a merge request
should give an errorBranch types don't match any existing branches.
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.
Related to #404777 (closed)
Merge request reports
Activity
changed milestone to %16.1
assigned to @mcavoj
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.
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 Rad Batnag (
@radbatnag
) (UTC+8)Matthias Käppler (
@mkaeppler
) (UTC+2)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
Dangermarked the checklist item I have evaluated the MR acceptance checklist for this MR. as completed
mentioned in merge request !121679 (merged)
added featureaddition label
mentioned in issue #404777 (closed)
- Resolved by Martin Čavoj
- A deleted user
added documentation feature flag labels
Allure report
allure-report-publisher
generated test report!e2e-test-on-gdk:
test report for 8de296ffexpand test summary
+-----------------------------------------------------------------------+ | suites summary | +------------------+--------+--------+---------+-------+-------+--------+ | | passed | failed | skipped | flaky | total | result | +------------------+--------+--------+---------+-------+-------+--------+ | Create | 8 | 0 | 1 | 0 | 9 | ✅ | | Framework sanity | 0 | 0 | 1 | 0 | 1 | ➖ | | Manage | 1 | 0 | 0 | 0 | 1 | ✅ | | Plan | 4 | 0 | 0 | 0 | 4 | ✅ | | Data Stores | 2 | 0 | 0 | 1 | 2 | ❗ | | Monitor | 4 | 0 | 0 | 0 | 4 | ✅ | | Govern | 2 | 0 | 0 | 0 | 2 | ✅ | +------------------+--------+--------+---------+-------+-------+--------+ | Total | 21 | 0 | 2 | 1 | 23 | ❗ | +------------------+--------+--------+---------+-------+-------+--------+
e2e-package-and-test:
test report for 5bbd48b1expand test summary
+-----------------------------------------------------------------------+ | suites summary | +------------------+--------+--------+---------+-------+-------+--------+ | | passed | failed | skipped | flaky | total | result | +------------------+--------+--------+---------+-------+-------+--------+ | Plan | 150 | 0 | 0 | 0 | 150 | ✅ | | Govern | 82 | 0 | 10 | 2 | 92 | ❗ | | Create | 262 | 0 | 44 | 8 | 306 | ❗ | | Data Stores | 68 | 0 | 0 | 0 | 68 | ✅ | | Manage | 64 | 0 | 6 | 2 | 70 | ❗ | | Verify | 104 | 0 | 10 | 0 | 114 | ✅ | | Release | 12 | 0 | 0 | 0 | 12 | ✅ | | Analytics | 4 | 0 | 0 | 0 | 4 | ✅ | | Fulfillment | 4 | 0 | 50 | 0 | 54 | ✅ | | Framework sanity | 0 | 0 | 2 | 0 | 2 | ➖ | | Package | 0 | 0 | 6 | 0 | 6 | ➖ | | Monitor | 16 | 0 | 4 | 0 | 20 | ✅ | | ModelOps | 0 | 0 | 2 | 0 | 2 | ➖ | | Secure | 4 | 0 | 18 | 0 | 22 | ✅ | | Growth | 0 | 0 | 4 | 0 | 4 | ➖ | | Configure | 0 | 0 | 6 | 0 | 6 | ➖ | +------------------+--------+--------+---------+-------+-------+--------+ | Total | 770 | 0 | 162 | 12 | 932 | ❗ | +------------------+--------+--------+---------+-------+-------+--------+
added 3091 commits
- Resolved by Bala Kumar
Could you please do the initial backend review?
requested review from @bauerdominic
- Resolved by Martin Čavoj
- Resolved by Martin Čavoj
- Resolved by Martin Čavoj
requested review from @bala.kumar and removed review request for @bauerdominic
@bauerdominic
, 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
- Resolved by Bala Kumar
- Resolved by Martin Čavoj
removed review request for @bala.kumar
requested review from @bala.kumar
enabled an automatic merge when the pipeline for 0931de03 succeeds
mentioned in commit 0f75dadc
added workflowstaging-canary label and removed workflowin dev 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-production label and removed workflowproduction label