summaryrefslogtreecommitdiff
path: root/app/services/merge_requests/merge_base_service.rb
Commit message (Expand)AuthorAgeFilesLines
* Add latest changes from gitlab-org/gitlab@13-2-stable-eeGitLab Bot2020-07-201-1/+1
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-11-151-14/+14
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-09-131-0/+2
* [CE port] Bypass push rules for merge to ref serviceosw-bypass-push-rules-for-merge-to-refOswaldo Ferreira2019-07-091-0/+11
* Move error check to pvtOswaldo Ferreira2019-02-251-4/+6
* Extend error checking to be overwritten in EEOswaldo Ferreira2019-02-251-0/+4
* Check authorization in merge servicesOswaldo Ferreira2019-02-251-0/+4
* Support merge to ref for merge-commit and squashOswaldo Ferreira2019-02-251-0/+53