Commit e3c36850 authored by Lin Jen-Shin's avatar Lin Jen-Shin

Detect if we really want a new merge request properly

parent 358501df
......@@ -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,6 +138,7 @@ module CreatesCommit
# branch instead of @target_branch.
return if
create_merge_request? &&
# XXX: Don't understand why rubocop prefers this indention
@mr_source_project.repository.branch_exists?(@target_branch)
@target_branch
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment