gitlab-org--gitlab-foss/app/controllers/projects/commit_controller.rb

135 lines
4.0 KiB
Ruby
Raw Normal View History

2012-09-17 14:08:02 +00:00
# Controller for a specific Commit
#
# Not to be confused with CommitsController, plural.
class Projects::CommitController < Projects::ApplicationController
include CreatesCommit
2016-03-03 17:38:44 +00:00
include DiffHelper
2012-09-17 14:08:02 +00:00
# Authorize
before_action :require_non_empty_project
before_action :authorize_download_code!, except: [:cancel_builds, :retry_builds]
before_action :authorize_update_build!, only: [:cancel_builds, :retry_builds]
before_action :authorize_read_commit_status!, only: [:builds]
before_action :commit
before_action :define_show_vars, only: [:show, :builds]
before_action :authorize_edit_tree!, only: [:revert, :cherry_pick]
2012-09-17 14:08:02 +00:00
def show
apply_diff_view_cookie!
@line_notes = commit.notes.inline
@note = @project.build_commit_note(commit)
@notes = commit.notes.not_inline.fresh
@noteable = @commit
@comments_allowed = @reply_allowed = true
@comments_target = {
noteable_type: 'Commit',
commit_id: @commit.id
}
respond_to do |format|
format.html
2012-11-22 19:49:44 +00:00
format.diff { render text: @commit.to_diff }
format.patch { render text: @commit.to_patch }
2012-09-17 14:08:02 +00:00
end
end
def builds
end
def cancel_builds
2016-04-11 14:55:40 +00:00
ci_builds.running_or_pending.each(&:cancel)
2015-12-08 12:03:28 +00:00
redirect_back_or_default default: builds_namespace_project_commit_path(project.namespace, project, commit.sha)
end
def retry_builds
2016-04-11 14:55:40 +00:00
ci_builds.latest.failed.each do |build|
if build.retryable?
Ci::Build.retry(build)
end
end
2015-12-08 12:03:28 +00:00
redirect_back_or_default default: builds_namespace_project_commit_path(project.namespace, project, commit.sha)
end
def branches
@branches = @project.repository.branch_names_contains(commit.id)
@tags = @project.repository.tag_names_contains(commit.id)
render layout: false
end
def revert
assign_change_commit_vars(@commit.revert_branch_name)
2016-02-08 16:44:31 +00:00
return render_404 if @target_branch.blank?
create_commit(Commits::RevertService, success_notice: "The #{@commit.change_type_title} has been successfully reverted.",
success_path: successful_change_path, failure_path: failed_change_path)
end
def cherry_pick
assign_change_commit_vars(@commit.cherry_pick_branch_name)
return render_404 if @target_branch.blank?
create_commit(Commits::CherryPickService, success_notice: "The #{@commit.change_type_title} has been successfully cherry-picked.",
success_path: successful_change_path, failure_path: failed_change_path)
end
private
def successful_change_path
return referenced_merge_request_url if @commit.merged_merge_request
namespace_project_commits_url(@project.namespace, @project, @target_branch)
end
def failed_change_path
return referenced_merge_request_url if @commit.merged_merge_request
namespace_project_commit_url(@project.namespace, @project, params[:id])
end
def referenced_merge_request_url
namespace_project_merge_request_url(@project.namespace, @project, @commit.merged_merge_request)
end
def commit
2015-04-21 13:13:40 +00:00
@commit ||= @project.commit(params[:id])
end
2015-10-23 09:41:22 +00:00
2016-03-31 17:51:28 +00:00
def ci_commits
@ci_commits ||= project.ci_commits.where(sha: commit.sha)
end
2016-04-11 14:55:40 +00:00
def ci_builds
@ci_builds ||= Ci::Build.where(commit: ci_commits)
end
def define_show_vars
return git_not_found! unless commit
2016-03-03 17:38:44 +00:00
opts = diff_options
opts[:ignore_whitespace_change] = true if params[:format] == 'diff'
2016-03-03 17:38:44 +00:00
@diffs = commit.diffs(opts)
@diff_refs = [commit.parent || commit, commit]
@notes_count = commit.notes.count
2015-12-08 12:03:28 +00:00
2016-03-31 17:51:28 +00:00
@statuses = CommitStatus.where(commit: ci_commits)
@builds = Ci::Build.where(commit: ci_commits)
end
def assign_change_commit_vars(mr_source_branch)
2016-02-05 23:12:41 +00:00
@commit = project.commit(params[:id])
@target_branch = params[:target_branch]
@mr_source_branch = mr_source_branch
2016-02-05 23:12:41 +00:00
@mr_target_branch = @target_branch
@commit_params = {
2016-02-05 23:12:41 +00:00
commit: @commit,
create_merge_request: params[:create_merge_request].present? || different_project?
}
end
2012-09-17 14:08:02 +00:00
end