Skip to content
Snippets Groups Projects

Remove group branch modification setting ff

Merged Alexander Turinske requested to merge 503930-remove-feature-flag into master
All threads resolved!

What does this MR do and why?

Remove group branch modification setting

  • remove 'scan_result_policy_block_group_branch_modification' feature flag everywhere
  • update tests
  • update mocks in integration tests

Changelog: other

EE: true

References

Please include cross links to any resources that are relevant to this MR. This will give reviewers and future readers helpful context to give an efficient review of the changes introduced.

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

Screenshots are required for UI changes, and strongly recommended for all other merge requests.

Scenario Screenshot
search for scan_result_policy_block_group_branch_modification ff image
search for scanResultPolicyBlockGroupBranchModification ff image
Policy editor - Project image
Policy editor - Group image
Policy drawer image
Protected branches image

How to set up and validate locally

Numbered steps to set up and validate the change are strongly suggested.

  1. Upload a GitLab Ultimate license
  2. Navigate to a top-level group => Secure => Policies => New policy => Merge request approval policy
  3. Verify the Block group branch modification setting shows and can be toggled and modified, enable it
  4. Create the policy
  5. Navigate to the top-level-group => Settings => Repository => Protected Branches
  6. Verify branches are protected

Related to #503930 (closed)

Edited by Alexander Turinske

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Alexander Turinske
  • A deleted user added documentation label

    added documentation label

  • Lorenz van Herwaarden approved this merge request

    approved this merge request

  • 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.

  • E2E Test Result Summary

    allure-report-publisher generated test report!

    e2e-test-on-gdk: :white_check_mark: test report for 6919a408

    expand test summary
    +------------------------------------------------------------------+
    |                          suites summary                          |
    +-------------+--------+--------+---------+-------+-------+--------+
    |             | passed | failed | skipped | flaky | total | result |
    +-------------+--------+--------+---------+-------+-------+--------+
    | Plan        | 76     | 0      | 0       | 0     | 76    | ✅     |
    | Analytics   | 2      | 0      | 0       | 0     | 2     | ✅     |
    | Create      | 129    | 0      | 22      | 0     | 151   | ✅     |
    | Package     | 25     | 0      | 11      | 0     | 36    | ✅     |
    | Verify      | 43     | 0      | 2       | 0     | 45    | ✅     |
    | Govern      | 75     | 0      | 3       | 0     | 78    | ✅     |
    | Monitor     | 8      | 0      | 0       | 0     | 8     | ✅     |
    | Manage      | 1      | 0      | 1       | 0     | 2     | ✅     |
    | Data Stores | 33     | 0      | 1       | 0     | 34    | ✅     |
    | Ai-powered  | 0      | 0      | 1       | 0     | 1     | ➖     |
    | Secure      | 4      | 0      | 0       | 0     | 4     | ✅     |
    | Fulfillment | 2      | 0      | 0       | 0     | 2     | ✅     |
    | Release     | 5      | 0      | 0       | 0     | 5     | ✅     |
    +-------------+--------+--------+---------+-------+-------+--------+
    | Total       | 403    | 0      | 41      | 0     | 444   | ✅     |
    +-------------+--------+--------+---------+-------+-------+--------+

    e2e-test-on-cng: :white_check_mark: test report for 6919a408

    expand test summary
    +------------------------------------------------------------------+
    |                          suites summary                          |
    +-------------+--------+--------+---------+-------+-------+--------+
    |             | passed | failed | skipped | flaky | total | result |
    +-------------+--------+--------+---------+-------+-------+--------+
    | Plan        | 86     | 0      | 8       | 0     | 94    | ✅     |
    | Verify      | 49     | 0      | 16      | 0     | 65    | ✅     |
    | Create      | 140    | 0      | 20      | 0     | 160   | ✅     |
    | Govern      | 84     | 0      | 9       | 1     | 93    | ✅     |
    | Manage      | 1      | 0      | 9       | 0     | 10    | ✅     |
    | Package     | 24     | 0      | 14      | 0     | 38    | ✅     |
    | Data Stores | 33     | 0      | 10      | 0     | 43    | ✅     |
    | ModelOps    | 0      | 0      | 1       | 0     | 1     | ➖     |
    | Monitor     | 8      | 0      | 12      | 0     | 20    | ✅     |
    | Secure      | 2      | 0      | 5       | 0     | 7     | ✅     |
    | Fulfillment | 2      | 0      | 7       | 1     | 9     | ✅     |
    | Release     | 5      | 0      | 1       | 0     | 6     | ✅     |
    | Configure   | 0      | 0      | 3       | 0     | 3     | ➖     |
    | Ai-powered  | 0      | 0      | 2       | 0     | 2     | ➖     |
    | Growth      | 0      | 0      | 2       | 0     | 2     | ➖     |
    | Analytics   | 2      | 0      | 0       | 1     | 2     | ✅     |
    +-------------+--------+--------+---------+-------+-------+--------+
    | Total       | 436    | 0      | 119     | 3     | 555   | ✅     |
    +-------------+--------+--------+---------+-------+-------+--------+
  • Artur Fedorov requested review from @arfedoro

    requested review from @arfedoro

  • Artur Fedorov approved this merge request

    approved this merge request

  • Sashi Kumar Kumaresan approved this merge request

    approved this merge request

  • Sashi Kumar Kumaresan resolved all threads

    resolved all threads

  • Sashi Kumar Kumaresan enabled automatic add to merge train when checks pass

    enabled automatic add to merge train when checks pass

  • mentioned in commit 4a9df899

  • added workflowstaging label and removed workflowcanary label

  • Alexander Turinske changed title from Remove group branch modification setting to Remove group branch modification setting ff

    changed title from Remove group branch modification setting to Remove group branch modification setting ff

  • Marcos Rocha mentioned in merge request !175423 (merged)

    mentioned in merge request !175423 (merged)

  • Please register or sign in to reply
    Loading