Skip to content

Branch Rules: Allow to merge section with edit

Nataliia Radina requested to merge 439364-allowed-to-merge into master

What does this MR do and why?

Branch Rules: Allow to merge section with edit

Add edit button for the allow to merge, change the look of roles

Changelog: changed

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.

Before After
Screenshot_2024-04-22_at_10.58.15

How to set up and validate locally

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

  1. Enable edit_branch_rules FF
  2. Go to Settings > Repository > Branch Rules and select specific branch

Related to #439364 (closed) The code changes are related to the user interface of a branch rules settings page. The main changes are:

  • The "Edit" button is displayed for "Allowed to merge" instead of "Manage in branch protections" when edit_branch_rules ff is enabled.
  • The protection row component now uses a badge component to display access levels, and the comma separator between access levels has been removed.

Merge request reports