Prevent MRs to be dropped from Merge Trains for open discussions
What does this MR do?
Related to #220916 (closed)
With these changes, after adding an MR to Merge Train, new discussions and comments will not drop the MR from the train.
This MR needs both backend and frontend review.
Screenshots
SS1: The MR is ready to merge:
SS2: The MR is on the train:
----OUTDATED --- The MR is on the train, but there is an unresolved discussion OLD OUTDATED:
SS4: The MR is on the train, but there is an unresolved discussion NEW:
SS5: After the pipeline, the MR was merged successfully:
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
Edited by Furkan Ayhan