From e3c36850a618ee2f7f9087b681e62d8a50e7b1b1 Mon Sep 17 00:00:00 2001
From: Lin Jen-Shin <godfat@godfat.org>
Date: Fri, 6 Jan 2017 22:49:23 +0800
Subject: [PATCH] Detect if we really want a new merge request properly
---
app/controllers/concerns/creates_commit.rb | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb
index 516b1cac6ef..646d922cb24 100644
--- a/app/controllers/concerns/creates_commit.rb
+++ b/app/controllers/concerns/creates_commit.rb
@@ -92,7 +92,9 @@ module CreatesCommit
end
def create_merge_request?
- params[:create_merge_request].present?
+ # 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
end
# TODO: We should really clean this up
@@ -136,7 +138,8 @@ module CreatesCommit
# branch instead of @target_branch.
return if
create_merge_request? &&
- @mr_source_project.repository.branch_exists?(@target_branch)
+ # XXX: Don't understand why rubocop prefers this indention
+ @mr_source_project.repository.branch_exists?(@target_branch)
@target_branch
end
--
GitLab