summaryrefslogtreecommitdiff
path: root/app/services/auto_merge_service.rb
Commit message (Expand)AuthorAgeFilesLines
* Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42GitLab Bot2021-05-191-1/+1
* Add latest changes from gitlab-org/gitlab@12-10-stable-eeGitLab Bot2020-04-201-12/+25
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-09-131-0/+2
* Avoid calling freeze on already frozen strings in app/servicesdineshpanda2019-09-041-1/+1
* Split AutoMergeService interfaces into two `cancel` and `abort`make-explicit-endpoint-abort-in-auto-merge-ceShinya Maeda2019-07-051-0/+6
* Update merge options for auto merge strategiesShinya Maeda2019-06-121-0/+6
* Abstract auto merge processesShinya Maeda2019-06-031-0/+50