Split AutoMergeService interfaces into two `cancel` and `abort`
What does this MR do?
Currently, Auto Merge Service's interfaces have a method #cancel
. This method is for canceling auto merge in a merge request, however, this method is also used for disabling auto merge when a system failure occurs.
We should split the two distinct intentions, one is cancel
and another is abort
in order for avoiding confusion.
Close https://gitlab.com/gitlab-org/gitlab-ee/issues/12134
Does this MR meet the acceptance criteria?
Conformity
-
Changelog entry -
Documentation created/updated or follow-up review issue created -
Code review guidelines -
Merge request performance guidelines -
Style guides -
Database guides -
Separation of EE specific content
Performance 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
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 Shinya Maeda