281 lines
8.2 KiB
Ruby
281 lines
8.2 KiB
Ruby
class Projects::MergeRequestsController < Projects::ApplicationController
|
|
before_action :module_enabled
|
|
before_action :merge_request, only: [
|
|
:edit, :update, :show, :diffs, :commits, :merge, :merge_check,
|
|
:ci_status, :toggle_subscription
|
|
]
|
|
before_action :closes_issues, only: [:edit, :update, :show, :diffs, :commits]
|
|
before_action :validates_merge_request, only: [:show, :diffs, :commits]
|
|
before_action :define_show_vars, only: [:show, :diffs, :commits]
|
|
|
|
# Allow read any merge_request
|
|
before_action :authorize_read_merge_request!
|
|
|
|
# Allow write(create) merge_request
|
|
before_action :authorize_create_merge_request!, only: [:new, :create]
|
|
|
|
# Allow modify merge_request
|
|
before_action :authorize_update_merge_request!, only: [:close, :edit, :update, :sort]
|
|
|
|
def index
|
|
terms = params['issue_search']
|
|
@merge_requests = get_merge_requests_collection
|
|
|
|
if terms.present?
|
|
if terms =~ /\A[#!](\d+)\z/
|
|
@merge_requests = @merge_requests.where(iid: $1)
|
|
else
|
|
@merge_requests = @merge_requests.full_search(terms)
|
|
end
|
|
end
|
|
|
|
@merge_requests = @merge_requests.page(params[:page]).per(PER_PAGE)
|
|
|
|
respond_to do |format|
|
|
format.html
|
|
format.json do
|
|
render json: {
|
|
html: view_to_html_string("projects/merge_requests/_merge_requests")
|
|
}
|
|
end
|
|
end
|
|
end
|
|
|
|
def show
|
|
@note_counts = Note.where(commit_id: @merge_request.commits.map(&:id)).
|
|
group(:commit_id).count
|
|
|
|
respond_to do |format|
|
|
format.html
|
|
format.json { render json: @merge_request }
|
|
format.diff { render text: @merge_request.to_diff(current_user) }
|
|
format.patch { render text: @merge_request.to_patch(current_user) }
|
|
end
|
|
end
|
|
|
|
def diffs
|
|
@commit = @merge_request.last_commit
|
|
@comments_allowed = @reply_allowed = true
|
|
@comments_target = {
|
|
noteable_type: 'MergeRequest',
|
|
noteable_id: @merge_request.id
|
|
}
|
|
@line_notes = @merge_request.notes.where("line_code is not null")
|
|
|
|
respond_to do |format|
|
|
format.html
|
|
format.json { render json: { html: view_to_html_string("projects/merge_requests/show/_diffs") } }
|
|
end
|
|
end
|
|
|
|
def commits
|
|
respond_to do |format|
|
|
format.html { render 'show' }
|
|
format.json { render json: { html: view_to_html_string('projects/merge_requests/show/_commits') } }
|
|
end
|
|
end
|
|
|
|
def new
|
|
params[:merge_request] ||= ActionController::Parameters.new(source_project: @project)
|
|
@merge_request = MergeRequests::BuildService.new(project, current_user, merge_request_params).execute
|
|
|
|
@target_branches = if @merge_request.target_project
|
|
@merge_request.target_project.repository.branch_names
|
|
else
|
|
[]
|
|
end
|
|
|
|
@target_project = merge_request.target_project
|
|
@source_project = merge_request.source_project
|
|
@commits = @merge_request.compare_commits
|
|
@commit = @merge_request.compare_commits.last
|
|
@diffs = @merge_request.compare_diffs
|
|
@note_counts = Note.where(commit_id: @commits.map(&:id)).
|
|
group(:commit_id).count
|
|
end
|
|
|
|
def edit
|
|
@source_project = @merge_request.source_project
|
|
@target_project = @merge_request.target_project
|
|
@target_branches = @merge_request.target_project.repository.branch_names
|
|
end
|
|
|
|
def create
|
|
@target_branches ||= []
|
|
@merge_request = MergeRequests::CreateService.new(project, current_user, merge_request_params).execute
|
|
|
|
if @merge_request.valid?
|
|
redirect_to(merge_request_path(@merge_request))
|
|
else
|
|
@source_project = @merge_request.source_project
|
|
@target_project = @merge_request.target_project
|
|
render action: "new"
|
|
end
|
|
end
|
|
|
|
def update
|
|
@merge_request = MergeRequests::UpdateService.new(project, current_user, merge_request_params).execute(@merge_request)
|
|
|
|
if @merge_request.valid?
|
|
respond_to do |format|
|
|
format.js
|
|
format.html do
|
|
redirect_to([@merge_request.target_project.namespace.becomes(Namespace),
|
|
@merge_request.target_project, @merge_request])
|
|
end
|
|
format.json do
|
|
render json: {
|
|
saved: @merge_request.valid?,
|
|
assignee_avatar_url: @merge_request.assignee.try(:avatar_url)
|
|
}
|
|
end
|
|
end
|
|
else
|
|
render "edit"
|
|
end
|
|
end
|
|
|
|
def merge_check
|
|
if @merge_request.unchecked?
|
|
@merge_request.check_if_can_be_merged
|
|
end
|
|
|
|
closes_issues
|
|
|
|
render partial: "projects/merge_requests/widget/show.html.haml", layout: false
|
|
end
|
|
|
|
def merge
|
|
return access_denied! unless @merge_request.can_be_merged_by?(current_user)
|
|
|
|
if @merge_request.mergeable?
|
|
MergeWorker.perform_async(@merge_request.id, current_user.id, params)
|
|
@status = true
|
|
else
|
|
@status = false
|
|
end
|
|
end
|
|
|
|
def branch_from
|
|
#This is always source
|
|
@source_project = @merge_request.nil? ? @project : @merge_request.source_project
|
|
@commit = @repository.commit(params[:ref]) if params[:ref].present?
|
|
end
|
|
|
|
def branch_to
|
|
@target_project = selected_target_project
|
|
@commit = @target_project.commit(params[:ref]) if params[:ref].present?
|
|
end
|
|
|
|
def update_branches
|
|
@target_project = selected_target_project
|
|
@target_branches = @target_project.repository.branch_names
|
|
|
|
respond_to do |format|
|
|
format.js
|
|
end
|
|
end
|
|
|
|
def ci_status
|
|
ci_service = @merge_request.source_project.ci_service
|
|
status = ci_service.commit_status(merge_request.last_commit.sha, merge_request.source_branch)
|
|
|
|
if ci_service.respond_to?(:commit_coverage)
|
|
coverage = ci_service.commit_coverage(merge_request.last_commit.sha, merge_request.source_branch)
|
|
end
|
|
|
|
response = {
|
|
status: status,
|
|
coverage: coverage
|
|
}
|
|
|
|
render json: response
|
|
end
|
|
|
|
def toggle_subscription
|
|
@merge_request.toggle_subscription(current_user)
|
|
|
|
render nothing: true
|
|
end
|
|
|
|
protected
|
|
|
|
def selected_target_project
|
|
if @project.id.to_s == params[:target_project_id] || @project.forked_project_link.nil?
|
|
@project
|
|
else
|
|
@project.forked_project_link.forked_from_project
|
|
end
|
|
end
|
|
|
|
def merge_request
|
|
@merge_request ||= @project.merge_requests.find_by!(iid: params[:id])
|
|
end
|
|
|
|
def closes_issues
|
|
@closes_issues ||= @merge_request.closes_issues
|
|
end
|
|
|
|
def authorize_update_merge_request!
|
|
return render_404 unless can?(current_user, :update_merge_request, @merge_request)
|
|
end
|
|
|
|
def authorize_admin_merge_request!
|
|
return render_404 unless can?(current_user, :admin_merge_request, @merge_request)
|
|
end
|
|
|
|
def module_enabled
|
|
return render_404 unless @project.merge_requests_enabled
|
|
end
|
|
|
|
def validates_merge_request
|
|
# If source project was removed (Ex. mr from fork to origin)
|
|
return invalid_mr unless @merge_request.source_project
|
|
|
|
# Show git not found page
|
|
# if there is no saved commits between source & target branch
|
|
if @merge_request.commits.blank?
|
|
# and if target branch doesn't exist
|
|
return invalid_mr unless @merge_request.target_branch_exists?
|
|
|
|
# or if source branch doesn't exist
|
|
return invalid_mr unless @merge_request.source_branch_exists?
|
|
end
|
|
end
|
|
|
|
def define_show_vars
|
|
@participants = @merge_request.participants(current_user, @project)
|
|
|
|
# Build a note object for comment form
|
|
@note = @project.notes.new(noteable: @merge_request)
|
|
@notes = @merge_request.mr_and_commit_notes.inc_author.fresh
|
|
@discussions = Note.discussions_from_notes(@notes)
|
|
@noteable = @merge_request
|
|
|
|
# Get commits from repository
|
|
# or from cache if already merged
|
|
@commits = @merge_request.commits
|
|
|
|
@merge_request_diff = @merge_request.merge_request_diff
|
|
@source_branch = @merge_request.source_project.repository.find_branch(@merge_request.source_branch).try(:name)
|
|
|
|
if @merge_request.locked_long_ago?
|
|
@merge_request.unlock_mr
|
|
@merge_request.close
|
|
end
|
|
end
|
|
|
|
def invalid_mr
|
|
# Render special view for MR with removed source or target branch
|
|
render 'invalid'
|
|
end
|
|
|
|
def merge_request_params
|
|
params.require(:merge_request).permit(
|
|
:title, :assignee_id, :source_project_id, :source_branch,
|
|
:target_project_id, :target_branch, :milestone_id,
|
|
:state_event, :description, :task_num, label_ids: []
|
|
)
|
|
end
|
|
end
|