summaryrefslogtreecommitdiff
path: root/spec/services/auto_merge_service_spec.rb
Commit message (Expand)AuthorAgeFilesLines
* Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42GitLab Bot2020-11-191-1/+1
* Add latest changes from gitlab-org/gitlab@13-2-stable-eeGitLab Bot2020-07-201-1/+1
* Add latest changes from gitlab-org/gitlab@12-10-stable-eeGitLab Bot2020-04-201-7/+62
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2020-01-101-2/+2
* Split AutoMergeService interfaces into two `cancel` and `abort`make-explicit-endpoint-abort-in-auto-merge-ceShinya Maeda2019-07-051-0/+25
* Add auto merge strategiesadd-merge-train-auto-merge-strategy-ceShinya Maeda2019-06-121-2/+2
* Update merge options for auto merge strategiesShinya Maeda2019-06-121-0/+24
* Abstract auto merge processesShinya Maeda2019-06-031-0/+140