Make sure different project gets a merge request

Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_21626479

Make sure different project gets a merge request
eb242fc8 · Lin Jen-Shin · 406dfd6e · eb242fc8
Commit eb242fc8 authored Jan 26, 2017 by Lin Jen-Shin
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

creates_commit.rb app/controllers/concerns/creates_commit.rb +4 -2

No files found.
--- 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