Commit graph

8 commits

Author SHA1 Message Date
GitLab Bot
79040c6178 Add latest changes from gitlab-org/gitlab@master 2020-06-30 18:09:13 +00:00
GitLab Bot
6e81d7f628 Add latest changes from gitlab-org/gitlab@master 2019-11-15 15:06:12 +00:00
GitLab Bot
b7dfe2ae40 Add latest changes from gitlab-org/gitlab@master 2019-09-13 13:26:31 +00:00
Oswaldo Ferreira
84dd31493e [CE port] Bypass push rules for merge to ref service
Turns out push rules to validate commit message does
not apply in the context of automatic merge to
the refs/merge-requests/:iid/merge. Mainly because
if it fails to merge to it, we currently can't give enough
preemptive feedback to the user and it'll turn the
merge request unmergeable (given we automatically
mark it as unmergeable if we can't merge to the ref).

In general, it's a systematic operation, which already
bypasses user authorization and git hooks.

Therefore, this commit makes it bypass the push rules
at EE as well.
2019-07-09 14:36:29 -03:00
Oswaldo Ferreira
16011886be Move error check to pvt 2019-02-25 10:41:03 -03:00
Oswaldo Ferreira
7a8a5fe541 Extend error checking to be overwritten in EE 2019-02-25 10:41:02 -03:00
Oswaldo Ferreira
105212ce49 Check authorization in merge services
Move authorization checks to merge services
instead relying solely on external checks.
2019-02-25 10:41:01 -03:00
Oswaldo Ferreira
1ad699677f Support merge to ref for merge-commit and squash
Adds the ground work for writing into
the merge ref refs/merge-requests/:iid/merge the
merge result between source and target branches of
a MR, without further side-effects such as
mailing, MR updates and target branch changes.
2019-02-25 10:40:58 -03:00