From eb242fc865c032f6408f3b68700da9b840b416dd Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Thu, 26 Jan 2017 22:37:22 +0800 Subject: Make sure different project gets a merge request Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_21626479 --- app/controllers/concerns/creates_commit.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'app') diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb index fa7c22b5388..6286d67d30c 100644 --- a/app/controllers/concerns/creates_commit.rb +++ b/app/controllers/concerns/creates_commit.rb @@ -93,8 +93,10 @@ module CreatesCommit def create_merge_request? # XXX: Even if the field is set, if we're checking the same branch - # as the target branch, we don't want to create a merge request. - params[:create_merge_request].present? && @ref != @target_branch + # as the target branch in the same project, + # we don't want to create a merge request. + params[:create_merge_request].present? && + (different_project? || @ref != @target_branch) end # TODO: We should really clean this up -- cgit v1.2.1