Add warning message when changing target branch
Issue: #199795 (comment 297929812)
What does this MR do?
This MR adds a warning message whenever the user changes the target branch
To work iteratively, this issue will be resolved in 2 steps:
- Displays a warning message whenever the user changes the target branch > this MR
- Displays a warning message IF the approvals form is dirty when user changes the target branch > #212730 (closed)
Note: Background information on the code implementation of this MR see comment here
Testing Case
Setup
Let's setup our rules in the project settings so we can test out the toggle rule in edit MR...
- Go to Settings > General > expand "Merge request approvals"
- Add a new approval rule
- Create a new rule named "Any Rule" and target it to any branch
- Create a new rule named "Master Rule" and target it to "master" branch
(For details on how to add a rule scoped to a particular branch, please see the testing case of this MR > !24344 (merged))
Here's the end result you should see:
Create a new random new merge request targeting the master branch.
(optional) You might also need to create a MR, if none exists
- Create a new Merge Request
- In the "New Merge Request" > Source branch: select any source branch | Target branch: select "master" branch
- Fill in any random information
- Click "Submit merge request"
Edit MR
- Go to the Merge Request and click edit
- In the target branch dropdown, select a different branch
- A warning message will appear
-
a warning message will appear
-
click cancel and it will close -
"Master Rule" that was scoped to the master branch will NOT be fetched -
In the target branch dropdown, select the "master" branch.
-
click "Change target branch" and it will close -
"Master Rule" that was scoped to the master branch will be fetched
| target branch: random branch | target branch: master branch |
|---|---|
![]() |
![]() |
Screenshots
Does this MR meet the acceptance criteria?
Conformity
-
Changelog entry -
Documentation (if required) -
Code review guidelines -
Merge request performance guidelines -
Style guides -
Database guides -
Separation of EE specific content
Availability and Testing
-
Review and add/update tests for this feature/bug. Consider all test levels. See the Test Planning Process. -
Tested in all supported browsers -
Informed Infrastructure department of a default or new setting change, if applicable per definition of done
Security
If this MR contains changes to processing or storing of credentials or tokens, authorization and authentication methods and other items described in the security review guidelines:
-
Label as security and @ mention @gitlab-com/gl-security/appsec -
The MR includes necessary changes to maintain consistency between UI, API, email, or other methods -
Security reports checked/validated by a reviewer from the AppSec team
Closes #199795 (closed)



