summaryrefslogtreecommitdiff
path: root/app/services/auto_merge/base_service.rb
Commit message (Collapse)AuthorAgeFilesLines
* Add latest changes from gitlab-org/gitlab@14-7-stable-eev14.7.0-rc42GitLab Bot2022-01-201-3/+3
|
* Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42GitLab Bot2021-12-201-1/+1
|
* Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42GitLab Bot2021-08-191-3/+3
|
* Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42GitLab Bot2021-05-191-3/+3
|
* Add latest changes from gitlab-org/gitlab@13-4-stable-eeGitLab Bot2020-09-191-0/+15
|
* Add latest changes from gitlab-org/gitlab@13-2-stable-eeGitLab Bot2020-07-201-1/+5
|
* Add latest changes from gitlab-org/gitlab@13-1-stable-eeGitLab Bot2020-06-181-20/+34
|
* Add latest changes from gitlab-org/gitlab@12-10-stable-eeGitLab Bot2020-04-201-0/+8
|
* Only assign merge params when allowedBob Van Landuyt2019-10-241-3/+4
| | | | | | | | | When a user updates a merge request coming from a fork, they should not be able to set `force_remove_source_branch` if they cannot push code to the source project. Otherwise developers of the target project could remove the source branch of the source project by setting this flag through the API.
* Split AutoMergeService interfaces into two `cancel` and `abort`make-explicit-endpoint-abort-in-auto-merge-ceShinya Maeda2019-07-051-2/+12
| | | | Create explicit endpoint - abort.
* Update merge options for auto merge strategiesShinya Maeda2019-06-121-0/+8
| | | | | Currently, merge options is updated on #execute method, however, we should have #update interface to make it explicit.
* Notify when auto merge is enabledprocess-when-auto-merge-is-enabledShinya Maeda2019-06-101-0/+3
| | | | | There are bunch of auto merge related notifications, and when auto merge is enabled, it should be evaluated immediately.
* Create BaseService for Auto Merge architecturecreate-base-class-for-auto-merge-architectureShinya Maeda2019-06-061-0/+52
It abstracts some codes for common methods in AutoMerge::*Services.