700 lines
20 KiB
Ruby
700 lines
20 KiB
Ruby
class Projects::MergeRequestsController < Projects::ApplicationController
|
|
include ToggleSubscriptionAction
|
|
include DiffForPath
|
|
include DiffHelper
|
|
include IssuableActions
|
|
include NotesHelper
|
|
include ToggleAwardEmoji
|
|
include IssuableCollections
|
|
|
|
before_action :module_enabled
|
|
before_action :merge_request, only: [
|
|
:edit, :update, :show, :diffs, :commits, :conflicts, :conflict_for_path, :pipelines, :merge, :merge_check,
|
|
:ci_status, :ci_environments_status, :toggle_subscription, :cancel_merge_when_build_succeeds, :remove_wip, :resolve_conflicts, :assign_related_issues
|
|
]
|
|
before_action :validates_merge_request, only: [:show, :diffs, :commits, :pipelines]
|
|
before_action :define_show_vars, only: [:show, :diffs, :commits, :conflicts, :conflict_for_path, :builds, :pipelines]
|
|
before_action :define_widget_vars, only: [:merge, :cancel_merge_when_build_succeeds, :merge_check]
|
|
before_action :define_commit_vars, only: [:diffs]
|
|
before_action :define_diff_comment_vars, only: [:diffs]
|
|
before_action :ensure_ref_fetched, only: [:show, :diffs, :commits, :builds, :conflicts, :conflict_for_path, :pipelines]
|
|
before_action :close_merge_request_without_source_project, only: [:show, :diffs, :commits, :builds, :pipelines]
|
|
before_action :apply_diff_view_cookie!, only: [:new_diffs]
|
|
before_action :build_merge_request, only: [:new, :new_diffs]
|
|
|
|
# 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, :remove_wip, :sort]
|
|
|
|
before_action :authenticate_user!, only: [:assign_related_issues]
|
|
|
|
before_action :authorize_can_resolve_conflicts!, only: [:conflicts, :conflict_for_path, :resolve_conflicts]
|
|
|
|
def index
|
|
@collection_type = "MergeRequest"
|
|
@merge_requests = merge_requests_collection
|
|
@merge_requests = @merge_requests.page(params[:page])
|
|
@issuable_meta_data = issuable_meta_data(@merge_requests, @collection_type)
|
|
|
|
if @merge_requests.out_of_range? && @merge_requests.total_pages != 0
|
|
return redirect_to url_for(params.merge(page: @merge_requests.total_pages))
|
|
end
|
|
|
|
if params[:label_name].present?
|
|
labels_params = { project_id: @project.id, title: params[:label_name] }
|
|
@labels = LabelsFinder.new(current_user, labels_params).execute
|
|
end
|
|
|
|
@users = []
|
|
if params[:assignee_id].present?
|
|
assignee = User.find_by_id(params[:assignee_id])
|
|
@users.push(assignee) if assignee
|
|
end
|
|
|
|
if params[:author_id].present?
|
|
author = User.find_by_id(params[:author_id])
|
|
@users.push(author) if author
|
|
end
|
|
|
|
respond_to do |format|
|
|
format.html
|
|
format.json do
|
|
render json: {
|
|
html: view_to_html_string("projects/merge_requests/_merge_requests"),
|
|
labels: @labels.as_json(methods: :text_color)
|
|
}
|
|
end
|
|
end
|
|
end
|
|
|
|
def show
|
|
respond_to do |format|
|
|
format.html { define_discussion_vars }
|
|
|
|
format.json do
|
|
render json: MergeRequestSerializer.new.represent(@merge_request)
|
|
end
|
|
|
|
format.patch do
|
|
return render_404 unless @merge_request.diff_refs
|
|
|
|
send_git_patch @project.repository, @merge_request.diff_refs
|
|
end
|
|
|
|
format.diff do
|
|
return render_404 unless @merge_request.diff_refs
|
|
|
|
send_git_diff @project.repository, @merge_request.diff_refs
|
|
end
|
|
end
|
|
end
|
|
|
|
def diffs
|
|
apply_diff_view_cookie!
|
|
|
|
@merge_request_diff =
|
|
if params[:diff_id]
|
|
@merge_request.merge_request_diffs.viewable.find(params[:diff_id])
|
|
else
|
|
@merge_request.merge_request_diff
|
|
end
|
|
|
|
@merge_request_diffs = @merge_request.merge_request_diffs.viewable.select_without_diff
|
|
@comparable_diffs = @merge_request_diffs.select { |diff| diff.id < @merge_request_diff.id }
|
|
|
|
if params[:start_sha].present?
|
|
@start_sha = params[:start_sha]
|
|
@start_version = @comparable_diffs.find { |diff| diff.head_commit_sha == @start_sha }
|
|
|
|
unless @start_version
|
|
@start_sha = @merge_request_diff.head_commit_sha
|
|
@start_version = @merge_request_diff
|
|
end
|
|
end
|
|
|
|
@environment = @merge_request.environments_for(current_user).last
|
|
|
|
respond_to do |format|
|
|
format.html { define_discussion_vars }
|
|
format.json do
|
|
if @start_sha
|
|
compared_diff_version
|
|
else
|
|
original_diff_version
|
|
end
|
|
|
|
render json: { html: view_to_html_string("projects/merge_requests/show/_diffs") }
|
|
end
|
|
end
|
|
end
|
|
|
|
# With an ID param, loads the MR at that ID. Otherwise, accepts the same params as #new
|
|
# and uses that (unsaved) MR.
|
|
#
|
|
def diff_for_path
|
|
if params[:id]
|
|
merge_request
|
|
define_diff_comment_vars
|
|
else
|
|
build_merge_request
|
|
@diff_notes_disabled = true
|
|
@grouped_diff_discussions = {}
|
|
end
|
|
|
|
define_commit_vars
|
|
|
|
render_diff_for_path(@merge_request.diffs(diff_options))
|
|
end
|
|
|
|
def commits
|
|
respond_to do |format|
|
|
format.html do
|
|
define_discussion_vars
|
|
|
|
render 'show'
|
|
end
|
|
format.json do
|
|
# Get commits from repository
|
|
# or from cache if already merged
|
|
@commits = @merge_request.commits
|
|
@note_counts = Note.where(commit_id: @commits.map(&:id)).
|
|
group(:commit_id).count
|
|
|
|
render json: { html: view_to_html_string('projects/merge_requests/show/_commits') }
|
|
end
|
|
end
|
|
end
|
|
|
|
def conflicts
|
|
respond_to do |format|
|
|
format.html { define_discussion_vars }
|
|
|
|
format.json do
|
|
if @merge_request.conflicts_can_be_resolved_in_ui?
|
|
render json: @merge_request.conflicts
|
|
elsif @merge_request.can_be_merged?
|
|
render json: {
|
|
message: 'The merge conflicts for this merge request have already been resolved. Please return to the merge request.',
|
|
type: 'error'
|
|
}
|
|
else
|
|
render json: {
|
|
message: 'The merge conflicts for this merge request cannot be resolved through GitLab. Please try to resolve them locally.',
|
|
type: 'error'
|
|
}
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
def conflict_for_path
|
|
return render_404 unless @merge_request.conflicts_can_be_resolved_in_ui?
|
|
|
|
file = @merge_request.conflicts.file_for_path(params[:old_path], params[:new_path])
|
|
|
|
return render_404 unless file
|
|
|
|
render json: file, full_content: true
|
|
end
|
|
|
|
def resolve_conflicts
|
|
return render_404 unless @merge_request.conflicts_can_be_resolved_in_ui?
|
|
|
|
if @merge_request.can_be_merged?
|
|
render status: :bad_request, json: { message: 'The merge conflicts for this merge request have already been resolved.' }
|
|
return
|
|
end
|
|
|
|
begin
|
|
MergeRequests::ResolveService.new(@merge_request.source_project, current_user, params).execute(@merge_request)
|
|
|
|
flash[:notice] = 'All merge conflicts were resolved. The merge request can now be merged.'
|
|
|
|
render json: { redirect_to: namespace_project_merge_request_url(@project.namespace, @project, @merge_request, resolved_conflicts: true) }
|
|
rescue Gitlab::Conflict::ResolutionError => e
|
|
render status: :bad_request, json: { message: e.message }
|
|
end
|
|
end
|
|
|
|
def pipelines
|
|
@pipelines = @merge_request.all_pipelines
|
|
|
|
respond_to do |format|
|
|
format.html do
|
|
define_discussion_vars
|
|
|
|
render 'show'
|
|
end
|
|
|
|
format.json do
|
|
render json: PipelineSerializer
|
|
.new(project: @project, user: @current_user)
|
|
.represent(@pipelines)
|
|
end
|
|
end
|
|
end
|
|
|
|
def new
|
|
respond_to do |format|
|
|
format.html { define_new_vars }
|
|
format.json do
|
|
define_pipelines_vars
|
|
|
|
render json: PipelineSerializer
|
|
.new(project: @project, user: @current_user)
|
|
.represent(@pipelines)
|
|
end
|
|
end
|
|
end
|
|
|
|
def new_diffs
|
|
respond_to do |format|
|
|
format.html do
|
|
define_new_vars
|
|
@show_changes_tab = true
|
|
render "new"
|
|
end
|
|
format.json do
|
|
@diffs = if @merge_request.can_be_created
|
|
@merge_request.diffs(diff_options)
|
|
else
|
|
[]
|
|
end
|
|
@diff_notes_disabled = true
|
|
|
|
@environment = @merge_request.environments_for(current_user).last
|
|
|
|
render json: { html: view_to_html_string('projects/merge_requests/_new_diffs', diffs: @diffs, environment: @environment) }
|
|
end
|
|
end
|
|
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 edit
|
|
@source_project = @merge_request.source_project
|
|
@target_project = @merge_request.target_project
|
|
@target_branches = @merge_request.target_project.repository.branch_names
|
|
end
|
|
|
|
def update
|
|
@merge_request = MergeRequests::UpdateService.new(project, current_user, merge_request_params).execute(@merge_request)
|
|
|
|
respond_to do |format|
|
|
format.html do
|
|
if @merge_request.valid?
|
|
redirect_to([@merge_request.target_project.namespace.becomes(Namespace), @merge_request.target_project, @merge_request])
|
|
else
|
|
render :edit
|
|
end
|
|
end
|
|
|
|
format.json do
|
|
render json: @merge_request.to_json(include: { milestone: {}, assignee: { methods: :avatar_url }, labels: { methods: :text_color } }, methods: [:task_status, :task_status_short])
|
|
end
|
|
end
|
|
rescue ActiveRecord::StaleObjectError
|
|
render_conflict_response
|
|
end
|
|
|
|
def remove_wip
|
|
MergeRequests::UpdateService.new(project, current_user, wip_event: 'unwip').execute(@merge_request)
|
|
|
|
redirect_to namespace_project_merge_request_path(@project.namespace, @project, @merge_request),
|
|
notice: "The merge request can now be merged."
|
|
end
|
|
|
|
def merge_check
|
|
@merge_request.check_if_can_be_merged
|
|
|
|
render partial: "projects/merge_requests/widget/show.html.haml", layout: false
|
|
end
|
|
|
|
def cancel_merge_when_build_succeeds
|
|
unless @merge_request.can_cancel_merge_when_build_succeeds?(current_user)
|
|
return access_denied!
|
|
end
|
|
|
|
MergeRequests::MergeWhenPipelineSucceedsService
|
|
.new(@project, current_user)
|
|
.cancel(@merge_request)
|
|
end
|
|
|
|
def merge
|
|
return access_denied! unless @merge_request.can_be_merged_by?(current_user)
|
|
|
|
# Disable the CI check if merge_when_build_succeeds is enabled since we have
|
|
# to wait until CI completes to know
|
|
unless @merge_request.mergeable?(skip_ci_check: merge_when_build_succeeds_active?)
|
|
@status = :failed
|
|
return
|
|
end
|
|
|
|
if params[:sha] != @merge_request.diff_head_sha
|
|
@status = :sha_mismatch
|
|
return
|
|
end
|
|
|
|
@merge_request.update(merge_error: nil)
|
|
|
|
if params[:merge_when_build_succeeds].present?
|
|
unless @merge_request.head_pipeline
|
|
@status = :failed
|
|
return
|
|
end
|
|
|
|
if @merge_request.head_pipeline.active?
|
|
MergeRequests::MergeWhenPipelineSucceedsService
|
|
.new(@project, current_user, merge_params)
|
|
.execute(@merge_request)
|
|
|
|
@status = :merge_when_build_succeeds
|
|
elsif @merge_request.head_pipeline.success?
|
|
# This can be triggered when a user clicks the auto merge button while
|
|
# the tests finish at about the same time
|
|
MergeWorker.perform_async(@merge_request.id, current_user.id, params)
|
|
@status = :success
|
|
else
|
|
@status = :failed
|
|
end
|
|
else
|
|
MergeWorker.perform_async(@merge_request.id, current_user.id, params)
|
|
@status = :success
|
|
end
|
|
end
|
|
|
|
def merge_widget_refresh
|
|
@status =
|
|
if merge_request.merge_when_build_succeeds
|
|
:merge_when_build_succeeds
|
|
else
|
|
# Only MRs that can be merged end in this action
|
|
# MR can be already picked up for merge / merged already or can be waiting for worker to be picked up
|
|
# in last case it does not have any special status. Possible error is handled inside widget js function
|
|
:success
|
|
end
|
|
|
|
render 'merge'
|
|
end
|
|
|
|
def branch_from
|
|
# This is always source
|
|
@source_project = @merge_request.nil? ? @project : @merge_request.source_project
|
|
|
|
if params[:ref].present?
|
|
@ref = params[:ref]
|
|
@commit = @repository.commit(@ref)
|
|
end
|
|
|
|
render layout: false
|
|
end
|
|
|
|
def branch_to
|
|
@target_project = selected_target_project
|
|
|
|
if params[:ref].present?
|
|
@ref = params[:ref]
|
|
@commit = @target_project.commit(@ref)
|
|
end
|
|
|
|
render layout: false
|
|
end
|
|
|
|
def update_branches
|
|
@target_project = selected_target_project
|
|
@target_branches = @target_project.repository.branch_names
|
|
|
|
render layout: false
|
|
end
|
|
|
|
def assign_related_issues
|
|
result = MergeRequests::AssignIssuesService.new(project, current_user, merge_request: @merge_request).execute
|
|
|
|
respond_to do |format|
|
|
format.html do
|
|
case result[:count]
|
|
when 0
|
|
flash[:error] = "Failed to assign you issues related to the merge request"
|
|
when 1
|
|
flash[:notice] = "1 issue has been assigned to you"
|
|
else
|
|
flash[:notice] = "#{result[:count]} issues have been assigned to you"
|
|
end
|
|
|
|
redirect_to(merge_request_path(@merge_request))
|
|
end
|
|
end
|
|
end
|
|
|
|
def ci_status
|
|
pipeline = @merge_request.head_pipeline
|
|
|
|
if pipeline
|
|
status = pipeline.status
|
|
coverage = pipeline.try(:coverage)
|
|
|
|
status = "success_with_warnings" if pipeline.success? && pipeline.has_warnings?
|
|
|
|
status ||= "preparing"
|
|
else
|
|
ci_service = @merge_request.source_project.try(:ci_service)
|
|
status = ci_service.commit_status(merge_request.diff_head_sha, merge_request.source_branch) if ci_service
|
|
end
|
|
|
|
response = {
|
|
title: merge_request.title,
|
|
sha: (merge_request.diff_head_commit.short_id if merge_request.diff_head_sha),
|
|
status: status,
|
|
coverage: coverage,
|
|
pipeline: pipeline.try(:id)
|
|
}
|
|
|
|
render json: response
|
|
end
|
|
|
|
def ci_environments_status
|
|
environments =
|
|
begin
|
|
@merge_request.environments_for(current_user).map do |environment|
|
|
project = environment.project
|
|
deployment = environment.first_deployment_for(@merge_request.diff_head_commit)
|
|
|
|
stop_url =
|
|
if environment.stop_action? && can?(current_user, :create_deployment, environment)
|
|
stop_namespace_project_environment_path(project.namespace, project, environment)
|
|
end
|
|
|
|
{
|
|
id: environment.id,
|
|
name: environment.name,
|
|
url: namespace_project_environment_path(project.namespace, project, environment),
|
|
stop_url: stop_url,
|
|
external_url: environment.external_url,
|
|
external_url_formatted: environment.formatted_external_url,
|
|
deployed_at: deployment.try(:created_at),
|
|
deployed_at_formatted: deployment.try(:formatted_deployment_time)
|
|
}
|
|
end.compact
|
|
end
|
|
|
|
render json: environments
|
|
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
|
|
@issuable = @merge_request ||= @project.merge_requests.find_by!(iid: params[:id])
|
|
end
|
|
alias_method :subscribable_resource, :merge_request
|
|
alias_method :issuable, :merge_request
|
|
alias_method :awardable, :merge_request
|
|
|
|
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 authorize_can_resolve_conflicts!
|
|
return render_404 unless @merge_request.conflicts_can_be_resolved_by?(current_user)
|
|
end
|
|
|
|
def module_enabled
|
|
return render_404 unless @project.feature_available?(:merge_requests, current_user)
|
|
end
|
|
|
|
def validates_merge_request
|
|
# Show git not found page
|
|
# if there is no saved commits between source & target branch
|
|
if @merge_request.has_no_commits?
|
|
# and if target branch doesn't exist
|
|
return invalid_mr unless @merge_request.target_branch_exists?
|
|
end
|
|
end
|
|
|
|
def define_show_vars
|
|
@noteable = @merge_request
|
|
@commits_count = @merge_request.commits_count
|
|
|
|
if @merge_request.locked_long_ago?
|
|
@merge_request.unlock_mr
|
|
@merge_request.close
|
|
end
|
|
|
|
labels
|
|
define_pipelines_vars
|
|
end
|
|
|
|
# Discussion tab data is rendered on html responses of actions
|
|
# :show, :diff, :commits, :builds. but not when request the data through AJAX
|
|
def define_discussion_vars
|
|
# Build a note object for comment form
|
|
@note = @project.notes.new(noteable: @merge_request)
|
|
|
|
@discussions = @merge_request.discussions
|
|
|
|
preload_noteable_for_regular_notes(@discussions.flat_map(&:notes))
|
|
|
|
# This is not executed lazily
|
|
@notes = Banzai::NoteRenderer.render(
|
|
@discussions.flat_map(&:notes),
|
|
@project,
|
|
current_user,
|
|
@path,
|
|
@project_wiki,
|
|
@ref
|
|
)
|
|
|
|
preload_max_access_for_authors(@notes, @project)
|
|
end
|
|
|
|
def define_widget_vars
|
|
@pipeline = @merge_request.head_pipeline
|
|
end
|
|
|
|
def define_commit_vars
|
|
@commit = @merge_request.diff_head_commit
|
|
@base_commit = @merge_request.diff_base_commit || @merge_request.likely_diff_base_commit
|
|
end
|
|
|
|
def define_diff_comment_vars
|
|
@comments_target = {
|
|
noteable_type: 'MergeRequest',
|
|
noteable_id: @merge_request.id
|
|
}
|
|
|
|
@use_legacy_diff_notes = !@merge_request.has_complete_diff_refs?
|
|
@grouped_diff_discussions = @merge_request.notes.inc_relations_for_view.grouped_diff_discussions
|
|
|
|
Banzai::NoteRenderer.render(
|
|
@grouped_diff_discussions.values.flat_map(&:notes),
|
|
@project,
|
|
current_user,
|
|
@path,
|
|
@project_wiki,
|
|
@ref
|
|
)
|
|
end
|
|
|
|
def define_pipelines_vars
|
|
@pipelines = @merge_request.all_pipelines
|
|
@pipeline = @merge_request.head_pipeline
|
|
@statuses_count = @pipeline.present? ? @pipeline.statuses.relevant.count : 0
|
|
end
|
|
|
|
def define_new_vars
|
|
@noteable = @merge_request
|
|
|
|
@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.reverse
|
|
@commit = @merge_request.diff_head_commit
|
|
@base_commit = @merge_request.diff_base_commit
|
|
|
|
@note_counts = Note.where(commit_id: @commits.map(&:id)).
|
|
group(:commit_id).count
|
|
|
|
@labels = LabelsFinder.new(current_user, project_id: @project.id).execute
|
|
|
|
@show_changes_tab = params[:show_changes].present?
|
|
|
|
define_pipelines_vars
|
|
end
|
|
|
|
def invalid_mr
|
|
# Render special view for MR with removed target branch
|
|
render 'invalid'
|
|
end
|
|
|
|
def merge_request_params
|
|
params.require(:merge_request)
|
|
.permit(merge_request_params_ce)
|
|
end
|
|
|
|
def merge_request_params_ce
|
|
[
|
|
:assignee_id,
|
|
:description,
|
|
:force_remove_source_branch,
|
|
:lock_version,
|
|
:milestone_id,
|
|
:source_branch,
|
|
:source_project_id,
|
|
:state_event,
|
|
:target_branch,
|
|
:target_project_id,
|
|
:task_num,
|
|
:title,
|
|
|
|
label_ids: []
|
|
]
|
|
end
|
|
|
|
def merge_params
|
|
params.permit(:should_remove_source_branch, :commit_message)
|
|
end
|
|
|
|
# Make sure merge requests created before 8.0
|
|
# have head file in refs/merge-requests/
|
|
def ensure_ref_fetched
|
|
@merge_request.ensure_ref_fetched
|
|
end
|
|
|
|
def merge_when_build_succeeds_active?
|
|
params[:merge_when_build_succeeds].present? &&
|
|
@merge_request.head_pipeline && @merge_request.head_pipeline.active?
|
|
end
|
|
|
|
def build_merge_request
|
|
params[:merge_request] ||= ActionController::Parameters.new(source_project: @project)
|
|
@merge_request = MergeRequests::BuildService.new(project, current_user, merge_request_params.merge(diff_options: diff_options)).execute
|
|
end
|
|
|
|
def compared_diff_version
|
|
@diff_notes_disabled = true
|
|
@diffs = @merge_request_diff.compare_with(@start_sha).diffs(diff_options)
|
|
end
|
|
|
|
def original_diff_version
|
|
@diff_notes_disabled = !@merge_request_diff.latest?
|
|
@diffs = @merge_request_diff.diffs(diff_options)
|
|
end
|
|
|
|
def close_merge_request_without_source_project
|
|
if !@merge_request.source_project && @merge_request.open?
|
|
@merge_request.close
|
|
end
|
|
end
|
|
end
|