Skip to content

Add squash settings drawer

Jacques Erasmus requested to merge 498702-br-squash-settings-edit into master

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: at this point, the backend for this feature is not ready yet, so we cannot display the drawer on the frontend yet. This MR aims to make progress on the frontend while we wait for the backend by creating the drawer component without rendering it. Once the backend is ready we will render the drawer on the frontend and integrate it with the backend.

Implementation breakdown

description MR
Rename RuleDrawer to AccessLevelsDrawer !175971 (merged)
Create a SquashSettingsDrawer component 👈 this MR
Edit squash settings backend/frontend integration (incl. UX review) follow-up MR

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

⚠️ no visual changes are expected, but if you wish to verify the component locally, you may follow the steps below:

  1. Enable the :branch_rule_squash_settings feature flag.
  2. Apply this patch.
  3. Navigate to Project > Settings > Repository > Branch rules.
  4. Select or create a branch rule.
  5. On the Branch rule details page, click on the Edit button in the Squash commits when merging section.
  6. The drawer should open.

Related to #498702

Edited by Jacques Erasmus

Merge request reports