BigW Consortium Gitlab

Commit 593228ff by Lin Jen-Shin

Don't set invalid @mr_source_branch when create_merge_request?

parent dea589d6
...@@ -91,16 +91,13 @@ module CreatesCommit ...@@ -91,16 +91,13 @@ module CreatesCommit
@mr_source_project != @mr_target_project @mr_source_project != @mr_target_project
end end
def different_branch?
@mr_source_branch != @mr_target_branch || different_project?
end
def create_merge_request? def create_merge_request?
params[:create_merge_request].present? && different_branch? params[:create_merge_request].present?
end end
# TODO: We should really clean this up
def set_commit_variables def set_commit_variables
@mr_source_branch ||= @target_branch @mr_source_branch = @target_branch unless create_merge_request?
if can?(current_user, :push_code, @project) if can?(current_user, :push_code, @project)
# Edit file in this project # Edit file in this project
......
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