summaryrefslogtreecommitdiff
path: root/app/services/auto_merge
Commit message (Expand)AuthorAgeFilesLines
* Add latest changes from gitlab-org/gitlab@12-10-stable-eeGitLab Bot2020-04-202-1/+11
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-11-191-1/+1
* Only assign merge params when allowedBob Van Landuyt2019-10-241-3/+4
* Split AutoMergeService interfaces into two `cancel` and `abort`make-explicit-endpoint-abort-in-auto-merge-ceShinya Maeda2019-07-052-3/+19
* Fix MWPS system notes shows inconsistent shafix-mwps-shows-inconsistent-sha-ceShinya Maeda2019-07-041-1/+1
* Update merge options for auto merge strategiesShinya Maeda2019-06-121-0/+8
* Notify when auto merge is enabledprocess-when-auto-merge-is-enabledShinya Maeda2019-06-101-0/+3
* Create BaseService for Auto Merge architecturecreate-base-class-for-auto-merge-architectureShinya Maeda2019-06-062-29/+57
* Abstract auto merge processesShinya Maeda2019-06-031-0/+54