module CreatesCommit extend ActiveSupport::Concern def create_commit(service, success_path:, failure_path:, failure_view: nil, success_notice: nil) set_commit_variables commit_params = @commit_params.merge( source_project: @project, source_branch: @ref, target_branch: @target_branch, file_path: @path, previous_path: @previous_path ) puts "#" * 10 puts @previous_path puts "#" * 10 result = service.new(@tree_edit_project, current_user, commit_params).execute puts "#" * 30 puts result[:status] puts "#" * 30 if result[:status] == :success update_flash_notice(success_notice) respond_to do |format| format.html { redirect_to final_success_path(success_path) } format.json { render json: { message: "success", filePath: final_success_path(success_path) } } end else flash[:alert] = result[:message] 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 def authorize_edit_tree! return if can_collaborate_with_project? access_denied! end private 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) return success_path unless create_merge_request? merge_request_exists? ? existing_merge_request_path : new_merge_request_path end def new_merge_request_path new_namespace_project_merge_request_path( @mr_source_project.namespace, @mr_source_project, merge_request: { source_project_id: @mr_source_project.id, target_project_id: @mr_target_project.id, source_branch: @mr_source_branch, target_branch: @mr_target_branch } ) end def existing_merge_request_path namespace_project_merge_request_path(@mr_target_project.namespace, @mr_target_project, @merge_request) end def merge_request_exists? return @merge_request if defined?(@merge_request) @merge_request = @mr_target_project.merge_requests.opened.find_by( source_branch: @mr_source_branch, target_branch: @mr_target_branch ) end def different_project? @mr_source_project != @mr_target_project end def different_branch? @mr_source_branch != @mr_target_branch || different_project? end def create_merge_request? params[:create_merge_request].present? && different_branch? end def set_commit_variables @mr_source_branch ||= @target_branch if can?(current_user, :push_code, @project) # Edit file in this project @tree_edit_project = @project @mr_source_project = @project if @project.forked? # Merge request from this project to fork origin @mr_target_project = @project.forked_from_project @mr_target_branch = @mr_target_project.repository.root_ref else # Merge request to this project @mr_target_project = @project @mr_target_branch ||= @ref end else # Edit file in fork @tree_edit_project = current_user.fork_of(@project) # Merge request from fork to this project @mr_source_project = @tree_edit_project @mr_target_project = @project @mr_target_branch ||= @ref end end end