Indicate reverted status of a merged merge request
What does this MR do?
This MR adds a "reverted" indicator to the individual MR page when it has been reverted by another MR. It is also shown in MR list in projects/groups and the dashboard one. The (reverted) on the MR page will link to the merge request that reverted the current MR, similar to the moved indicator link on issues.
The MR also adds a small section in the user documentation about this feature.
Related to #35824.
Screenshots
Merge Request Page
| MR is reverted by another MR? | Before | After |
|---|---|---|
| No |  |
Unchanged |
| Yes |  |
 |
Merge Request List
| MR is reverted by another MR? | Before | After |
|---|---|---|
| No |  |
Unchanged |
| Yes |  |
 |
Steps to Test
- Go to a project
- Create the default branch if it doesn't exist
- Create a commit on a new branch
- Create a merge request from your new branch to the main branch
- Merge the merge request
- Click on the
Revertbutton in the merge section- alternative: go to the merge commit, click on the "Options" dropdown, and click
Revert
- alternative: go to the merge commit, click on the "Options" dropdown, and click
- Keep the option "Start a new merge request with these changes" enabled
- optional: Check that the MR you want to revert doesn't yet indicate that it's been reverted
- Merge the reverting MR
- Check that the initial MR links to the reverting MR in the status (
Merged (reverted))
To check that the (reverted) indicator is shown in the list, go to /dashboard/merge_requests locally.
Short Video Demo
VD: the video demos the steps described in the current sectionDoes 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
Edited by Kev