<!--IssueSummary start--> <details> <summary> Everyone can contribute. [Help move this issue forward](https://handbook.gitlab.com/handbook/marketing/developer-relations/contributor-success/community-contributors-workflows/#contributor-links) while earning points, leveling up and collecting rewards. </summary> - [Close this issue](https://contributors.gitlab.com/manage-issue?action=close&projectId=278964&issueIid=536408) </details> <!--IssueSummary end--> <!--- Please read this! Before opening a new issue, make sure to search for keywords in the issues filtered by the "regression" or "type::bug" label: - https://gitlab.com/gitlab-org/gitlab/issues?label_name%5B%5D=regression - https://gitlab.com/gitlab-org/gitlab/issues?label_name%5B%5D=type::bug and verify the issue you're about to submit isn't a duplicate. ---> ### Summary <!-- Summarize the bug encountered concisely. --> When deleting a branch rule that has associated approval rules, the approval rules are automatically transferred to "All branches" instead of being deleted or prompting for user input on how to handle them. This was [reported by customer](https://gitlab.zendesk.com/agent/tickets/620412) - Zendesk Internal Only ### Steps to reproduce 1. Create a branch rule for a specific branch (e.g., `branch-for-branch-rules`) 2. Add an approval rule to this branch rule 3. Verify that the approval rule is correctly associated with the specific branch 4. Delete the branch rule 5. Observe that the approval rule is automatically moved to "All branches" <!-- Describe how one can reproduce the issue - this is very important. Please use an ordered list. --> ### Example Project <!-- If possible, please create an example project here on GitLab.com that exhibits the problematic behavior, and link to it here in the bug report. If you are using an older version of GitLab, this will also determine whether the bug is fixed in a more recent version. --> ### What is the current *bug* behavior? When a branch rule is deleted, any associated approval rules are automatically transferred to the "All branches" configuration without user notification or confirmation. <!-- Describe what actually happens. --> ### What is the expected *correct* behavior? One of the following should occur: 1. Approval rules should be deleted along with their associated branch rule 2. User should be prompted to choose what happens to the approval rules (delete/keep/transfer) 3. Approval rules should remain specific to the branch but marked as inactive <!-- Describe what you should see instead. --> ### Relevant logs and/or screenshots <!-- Paste any relevant logs - please use code blocks (```) to format console output, logs, and code as it's tough to read otherwise. --> ### Output of checks <!-- If you are reporting a bug on GitLab.com, uncomment below --> This bug happens on GitLab.com <!-- and uncomment below if you have /label privileges --> <!-- or follow up with an issue comment of `@gitlab-bot label ~"reproduced on GitLab.com"` if you do not --> #### Results of GitLab environment info <!-- Input any relevant GitLab environment information if needed. --> <details> <summary>Expand for output related to GitLab environment info</summary> <pre> (For installations with omnibus-gitlab package run and paste the output of: `sudo gitlab-rake gitlab:env:info`) (For installations from source run and paste the output of: `sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production`) </pre> </details> #### Results of GitLab application Check <!-- Input any relevant GitLab application check information if needed. --> <details> <summary>Expand for output related to the GitLab application check</summary> <pre> (For installations with omnibus-gitlab package run and paste the output of: `sudo gitlab-rake gitlab:check SANITIZE=true`) (For installations from source run and paste the output of: `sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production SANITIZE=true`) (we will only investigate if the tests are passing) </pre> </details> ### Workaround Currently, users must: 1. Before deleting a branch rule, note any associated approval rules 2. Delete the branch rule 3. Manually remove the approval rules that were transferred to "All branches" 4. Recreate any necessary approval rules in their intended location ### Proposed Solution 1. Short-term: - Add a confirmation dialog when deleting branch rules with associated approval rules - Provide options in the dialog for handling the approval rules - Add warning notifications about approval rule transfer 2. Long-term: - Implement proper cleanup of associated approval rules - Add user preferences for handling orphaned approval rules - Improve UI feedback when approval rules are affected by branch rule changes <!-- If you can, link to the line of code that might be responsible for the problem. --> <!-- If you don't have /label privileges, follow up with an issue comment of `@gitlab-bot label ~"type::bug"` -->