summaryrefslogtreecommitdiff
path: root/spec/services/auto_merge/base_service_spec.rb
Commit message (Expand)AuthorAgeFilesLines
* Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42GitLab Bot2021-05-191-4/+4
* 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-2/+2
* Add latest changes from gitlab-org/gitlab@13-1-stable-eeGitLab Bot2020-06-181-6/+93
* Only assign merge params when allowedBob Van Landuyt2019-10-241-2/+1
* Split AutoMergeService interfaces into two `cancel` and `abort`make-explicit-endpoint-abort-in-auto-merge-ceShinya Maeda2019-07-051-5/+35
* Fix MWPS system notes shows inconsistent shafix-mwps-shows-inconsistent-sha-ceShinya Maeda2019-07-041-0/+5
* Update merge options for auto merge strategiesShinya Maeda2019-06-121-0/+24
* Notify when auto merge is enabledprocess-when-auto-merge-is-enabledShinya Maeda2019-06-101-0/+10
* Create BaseService for Auto Merge architecturecreate-base-class-for-auto-merge-architectureShinya Maeda2019-06-061-0/+144