gitlab-org--gitlab-foss/app/controllers/concerns/creates_commit.rb

131 lines
4 KiB
Ruby
Raw Normal View History

module CreatesCommit
extend ActiveSupport::Concern
include Gitlab::Utils::StrongMemoize
# rubocop:disable Gitlab/ModuleWithInstanceVariables
def create_commit(service, success_path:, failure_path:, failure_view: nil, success_notice: nil)
if user_access(@project).can_push_to_branch?(branch_name_or_ref)
2017-04-19 20:37:44 -04:00
@project_to_commit_into = @project
@branch_name ||= @ref
else
@project_to_commit_into = current_user.fork_of(@project)
@branch_name ||= @project_to_commit_into.repository.next_branch('patch')
end
@start_branch ||= @ref || @branch_name
commit_params = @commit_params.merge(
2017-04-19 20:37:44 -04:00
start_project: @project,
start_branch: @start_branch,
branch_name: @branch_name
)
2017-04-19 20:37:44 -04:00
result = service.new(@project_to_commit_into, current_user, commit_params).execute
if result[:status] == :success
2016-02-09 14:50:25 -05:00
update_flash_notice(success_notice)
success_path = final_success_path(success_path)
respond_to do |format|
format.html { redirect_to success_path }
format.json { render json: { message: "success", filePath: success_path } }
end
else
flash[:alert] = result[:message]
failure_path = failure_path.call if failure_path.respond_to?(:call)
respond_to do |format|
format.html do
if failure_view
render failure_view
else
redirect_to failure_path
end
end
format.json { render json: { message: "failed", filePath: failure_path } }
end
end
end
# rubocop:enable Gitlab/ModuleWithInstanceVariables
def authorize_edit_tree!
return if can_collaborate_with_project?(project, ref: branch_name_or_ref)
access_denied!
end
private
2016-02-09 14:50:25 -05:00
def update_flash_notice(success_notice)
flash[:notice] = success_notice || "Your changes have been successfully committed."
if create_merge_request?
if merge_request_exists?
flash[:notice] = nil
else
target = different_project? ? "project" : "branch"
flash[:notice] << " You can now submit a merge request to get this change into the original #{target}."
end
end
end
def final_success_path(success_path)
if create_merge_request?
merge_request_exists? ? existing_merge_request_path : new_merge_request_path
else
success_path = success_path.call if success_path.respond_to?(:call)
2016-02-09 14:50:25 -05:00
success_path
end
2016-02-09 14:50:25 -05:00
end
# rubocop:disable Gitlab/ModuleWithInstanceVariables
def new_merge_request_path
project_new_merge_request_path(
2017-04-19 20:37:44 -04:00
@project_to_commit_into,
merge_request: {
2017-04-19 20:37:44 -04:00
source_project_id: @project_to_commit_into.id,
target_project_id: @project.id,
source_branch: @branch_name,
target_branch: @start_branch
}
)
end
# rubocop:enable Gitlab/ModuleWithInstanceVariables
2016-02-09 14:50:25 -05:00
def existing_merge_request_path
project_merge_request_path(@project, @merge_request) # rubocop:disable Gitlab/ModuleWithInstanceVariables
2016-02-05 18:12:41 -05:00
end
# rubocop:disable Gitlab/ModuleWithInstanceVariables
2016-02-05 18:12:41 -05:00
def merge_request_exists?
strong_memoize(:merge_request) do
MergeRequestsFinder.new(current_user, project_id: @project.id)
.execute
.opened
.find_by(
source_project_id: @project_to_commit_into,
source_branch: @branch_name,
target_branch: @start_branch)
end
2016-02-05 18:12:41 -05:00
end
# rubocop:enable Gitlab/ModuleWithInstanceVariables
2016-02-05 18:12:41 -05:00
def different_project?
@project_to_commit_into != @project # rubocop:disable Gitlab/ModuleWithInstanceVariables
end
def create_merge_request?
# Even if the field is set, if we're checking the same 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? || @start_branch != @branch_name) # rubocop:disable Gitlab/ModuleWithInstanceVariables
2017-01-06 09:20:02 -05:00
end
def branch_name_or_ref
@branch_name || @ref # rubocop:disable Gitlab/ModuleWithInstanceVariables
end
end