debian-mirror-gitlab/app/controllers/projects/merge_requests_controller.rb

647 lines
19 KiB
Ruby
Raw Normal View History

2014-09-02 18:07:02 +05:30
class Projects::MergeRequestsController < Projects::ApplicationController
2016-06-02 11:05:42 +05:30
include ToggleSubscriptionAction
2016-08-24 12:49:21 +05:30
include DiffForPath
2016-06-02 11:05:42 +05:30
include DiffHelper
include IssuableActions
2016-09-13 17:45:13 +05:30
include NotesHelper
include ToggleAwardEmoji
2016-09-13 17:45:13 +05:30
include IssuableCollections
2016-06-02 11:05:42 +05:30
2015-09-11 14:41:01 +05:30
before_action :module_enabled
before_action :merge_request, only: [
2016-11-03 12:29:30 +05:30
:edit, :update, :show, :diffs, :commits, :conflicts, :conflict_for_path, :builds, :pipelines, :merge, :merge_check,
:ci_status, :ci_environments_status, :toggle_subscription, :cancel_merge_when_build_succeeds, :remove_wip, :resolve_conflicts, :assign_related_issues
2015-09-11 14:41:01 +05:30
]
2016-09-13 17:45:13 +05:30
before_action :validates_merge_request, only: [:show, :diffs, :commits, :builds, :pipelines]
2016-11-03 12:29:30 +05:30
before_action :define_show_vars, only: [:show, :diffs, :commits, :conflicts, :conflict_for_path, :builds, :pipelines]
2015-12-23 02:04:40 +05:30
before_action :define_widget_vars, only: [:merge, :cancel_merge_when_build_succeeds, :merge_check]
2016-08-24 12:49:21 +05:30
before_action :define_commit_vars, only: [:diffs]
before_action :define_diff_comment_vars, only: [:diffs]
2016-11-03 12:29:30 +05:30
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]
2014-09-02 18:07:02 +05:30
# Allow read any merge_request
2015-09-11 14:41:01 +05:30
before_action :authorize_read_merge_request!
2014-09-02 18:07:02 +05:30
# Allow write(create) merge_request
2015-09-11 14:41:01 +05:30
before_action :authorize_create_merge_request!, only: [:new, :create]
2014-09-02 18:07:02 +05:30
# Allow modify merge_request
2016-06-02 11:05:42 +05:30
before_action :authorize_update_merge_request!, only: [:close, :edit, :update, :remove_wip, :sort]
2014-09-02 18:07:02 +05:30
2016-11-03 12:29:30 +05:30
before_action :authenticate_user!, only: [:assign_related_issues]
before_action :authorize_can_resolve_conflicts!, only: [:conflicts, :conflict_for_path, :resolve_conflicts]
2016-09-13 17:45:13 +05:30
2014-09-02 18:07:02 +05:30
def index
2016-09-13 17:45:13 +05:30
@merge_requests = merge_requests_collection
2016-06-02 11:05:42 +05:30
@merge_requests = @merge_requests.page(params[:page])
2015-11-26 14:37:03 +05:30
@merge_requests = @merge_requests.preload(:target_project)
2014-09-02 18:07:02 +05:30
2016-11-03 12:29:30 +05:30
if params[:label_name].present?
labels_params = { project_id: @project.id, title: params[:label_name] }
@labels = LabelsFinder.new(current_user, labels_params).execute
end
2016-04-02 18:10:28 +05:30
2015-04-26 12:48:37 +05:30
respond_to do |format|
format.html
format.json do
render json: {
2016-06-02 11:05:42 +05:30
html: view_to_html_string("projects/merge_requests/_merge_requests"),
labels: @labels.as_json(methods: :text_color)
2015-04-26 12:48:37 +05:30
}
end
end
2014-09-02 18:07:02 +05:30
end
def show
respond_to do |format|
2016-08-24 12:49:21 +05:30
format.html { define_discussion_vars }
format.json do
render json: @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
2014-09-02 18:07:02 +05:30
end
end
def diffs
2016-04-02 18:10:28 +05:30
apply_diff_view_cookie!
2016-09-29 09:46:39 +05:30
@merge_request_diff =
if params[:diff_id]
@merge_request.merge_request_diffs.find(params[:diff_id])
else
@merge_request.merge_request_diff
end
@merge_request_diffs = @merge_request.merge_request_diffs.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
render_404
end
end
2014-09-02 18:07:02 +05:30
respond_to do |format|
2016-08-24 12:49:21 +05:30
format.html { define_discussion_vars }
2016-09-13 17:45:13 +05:30
format.json do
2016-09-29 09:46:39 +05:30
if @start_sha
compared_diff_version
else
original_diff_version
end
2016-09-13 17:45:13 +05:30
render json: { html: view_to_html_string("projects/merge_requests/show/_diffs") }
end
2014-09-02 18:07:02 +05:30
end
end
2016-08-24 12:49:21 +05:30
# 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
2016-09-13 17:45:13 +05:30
@grouped_diff_discussions = {}
2016-08-24 12:49:21 +05:30
end
define_commit_vars
2016-09-13 17:45:13 +05:30
render_diff_for_path(@merge_request.diffs(diff_options))
2016-08-24 12:49:21 +05:30
end
2015-09-11 14:41:01 +05:30
def commits
respond_to do |format|
2016-08-24 12:49:21 +05:30
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
2015-09-11 14:41:01 +05:30
end
end
2016-09-13 17:45:13 +05:30
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
2016-11-03 12:29:30 +05:30
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
2016-09-13 17:45:13 +05:30
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) }
2016-11-03 12:29:30 +05:30
rescue Gitlab::Conflict::ResolutionError => e
2016-09-13 17:45:13 +05:30
render status: :bad_request, json: { message: e.message }
end
end
2015-12-23 02:04:40 +05:30
def builds
respond_to do |format|
2016-08-24 12:49:21 +05:30
format.html do
define_discussion_vars
render 'show'
end
2015-12-23 02:04:40 +05:30
format.json { render json: { html: view_to_html_string('projects/merge_requests/show/_builds') } }
end
end
2016-09-13 17:45:13 +05:30
def pipelines
@pipelines = @merge_request.all_pipelines
respond_to do |format|
format.html do
define_discussion_vars
render 'show'
end
format.json { render json: { html: view_to_html_string('projects/merge_requests/show/_pipelines') } }
end
end
2014-09-02 18:07:02 +05:30
def new
2016-11-03 12:29:30 +05:30
define_new_vars
end
2015-12-23 02:04:40 +05:30
2016-11-03 12:29:30 +05:30
def new_diffs
respond_to do |format|
format.html do
define_new_vars
render "new"
end
format.json do
@diffs = if @merge_request.can_be_created
@merge_request.diffs(diff_options)
else
[]
end
@diff_notes_disabled = true
render json: { html: view_to_html_string('projects/merge_requests/_new_diffs', diffs: @diffs) }
end
end
2014-09-02 18:07:02 +05:30
end
def create
@target_branches ||= []
@merge_request = MergeRequests::CreateService.new(project, current_user, merge_request_params).execute
if @merge_request.valid?
2015-04-26 12:48:37 +05:30
redirect_to(merge_request_path(@merge_request))
2014-09-02 18:07:02 +05:30
else
@source_project = @merge_request.source_project
@target_project = @merge_request.target_project
render action: "new"
end
end
2015-12-23 02:04:40 +05:30
def edit
@source_project = @merge_request.source_project
@target_project = @merge_request.target_project
@target_branches = @merge_request.target_project.repository.branch_names
end
2014-09-02 18:07:02 +05:30
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.html do
2015-04-26 12:48:37 +05:30
redirect_to([@merge_request.target_project.namespace.becomes(Namespace),
@merge_request.target_project, @merge_request])
end
format.json do
2016-06-02 11:05:42 +05:30
render json: @merge_request.to_json(include: { milestone: {}, assignee: { methods: :avatar_url }, labels: { methods: :text_color } })
2014-09-02 18:07:02 +05:30
end
end
else
render "edit"
end
2016-09-29 09:46:39 +05:30
rescue ActiveRecord::StaleObjectError
@conflict = true
render :edit
2014-09-02 18:07:02 +05:30
end
2016-06-02 11:05:42 +05:30
def remove_wip
2016-11-03 12:29:30 +05:30
MergeRequests::UpdateService.new(project, current_user, wip_event: 'unwip').execute(@merge_request)
2016-06-02 11:05:42 +05:30
redirect_to namespace_project_merge_request_path(@project.namespace, @project, @merge_request),
notice: "The merge request can now be merged."
end
2015-09-25 12:07:36 +05:30
def merge_check
@merge_request.check_if_can_be_merged
2015-09-11 14:41:01 +05:30
render partial: "projects/merge_requests/widget/show.html.haml", layout: false
2014-09-02 18:07:02 +05:30
end
2015-12-23 02:04:40 +05:30
def cancel_merge_when_build_succeeds
return access_denied! unless @merge_request.can_cancel_merge_when_build_succeeds?(current_user)
MergeRequests::MergeWhenBuildSucceedsService.new(@project, current_user).cancel(@merge_request)
end
2015-09-25 12:07:36 +05:30
def merge
2015-09-11 14:41:01 +05:30
return access_denied! unless @merge_request.can_be_merged_by?(current_user)
2014-09-02 18:07:02 +05:30
2016-08-24 12:49:21 +05:30
# 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?)
2015-12-23 02:04:40 +05:30
@status = :failed
return
end
2016-08-24 12:49:21 +05:30
if params[:sha] != @merge_request.diff_head_sha
@status = :sha_mismatch
return
end
2015-12-23 02:04:40 +05:30
@merge_request.update(merge_error: nil)
2016-08-24 12:49:21 +05:30
if params[:merge_when_build_succeeds].present?
unless @merge_request.pipeline
@status = :failed
return
end
if @merge_request.pipeline.active?
MergeRequests::MergeWhenBuildSucceedsService.new(@project, current_user, merge_params)
.execute(@merge_request)
@status = :merge_when_build_succeeds
elsif @merge_request.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
2014-09-02 18:07:02 +05:30
else
2015-12-23 02:04:40 +05:30
MergeWorker.perform_async(@merge_request.id, current_user.id, params)
@status = :success
2014-09-02 18:07:02 +05:30
end
end
def branch_from
# This is always source
2014-09-02 18:07:02 +05:30
@source_project = @merge_request.nil? ? @project : @merge_request.source_project
2016-11-24 13:41:30 +05:30
if params[:ref].present?
@ref = params[:ref]
@commit = @repository.commit(@ref)
end
2016-06-02 11:05:42 +05:30
render layout: false
2014-09-02 18:07:02 +05:30
end
def branch_to
@target_project = selected_target_project
2016-11-24 13:41:30 +05:30
if params[:ref].present?
@ref = params[:ref]
@commit = @target_project.commit(@ref)
end
2016-06-02 11:05:42 +05:30
render layout: false
2014-09-02 18:07:02 +05:30
end
def update_branches
@target_project = selected_target_project
@target_branches = @target_project.repository.branch_names
2016-06-02 11:05:42 +05:30
render layout: false
2014-09-02 18:07:02 +05:30
end
2016-11-03 12:29:30 +05:30
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
2014-09-02 18:07:02 +05:30
def ci_status
pipeline = @merge_request.pipeline
if pipeline
status = pipeline.status
coverage = pipeline.try(:coverage)
2016-08-24 12:49:21 +05:30
status = "success_with_warnings" if pipeline.success? && pipeline.has_warnings?
status ||= "preparing"
2016-06-02 11:05:42 +05:30
else
2016-11-03 12:29:30 +05:30
ci_service = @merge_request.source_project.try(:ci_service)
2016-08-24 12:49:21 +05:30
status = ci_service.commit_status(merge_request.diff_head_sha, merge_request.source_branch) if ci_service
2015-04-26 12:48:37 +05:30
2016-06-02 11:05:42 +05:30
if ci_service.respond_to?(:commit_coverage)
2016-08-24 12:49:21 +05:30
coverage = ci_service.commit_coverage(merge_request.diff_head_sha, merge_request.source_branch)
2016-06-02 11:05:42 +05:30
end
2015-04-26 12:48:37 +05:30
end
response = {
2016-06-02 11:05:42 +05:30
title: merge_request.title,
2016-08-24 12:49:21 +05:30
sha: merge_request.diff_head_commit.short_id,
2015-04-26 12:48:37 +05:30
status: status,
coverage: coverage
}
2014-09-02 18:07:02 +05:30
render json: response
end
2016-11-03 12:29:30 +05:30
def ci_environments_status
environments =
begin
@merge_request.environments.map do |environment|
next unless can?(current_user, :read_environment, environment)
project = environment.project
deployment = environment.first_deployment_for(@merge_request.diff_head_commit)
stop_url =
if environment.stoppable? && 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
2014-09-02 18:07:02 +05:30
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
2016-09-13 17:45:13 +05:30
@issuable = @merge_request ||= @project.merge_requests.find_by!(iid: params[:id])
2014-09-02 18:07:02 +05:30
end
2016-06-02 11:05:42 +05:30
alias_method :subscribable_resource, :merge_request
alias_method :issuable, :merge_request
alias_method :awardable, :merge_request
2014-09-02 18:07:02 +05:30
2015-09-11 14:41:01 +05:30
def authorize_update_merge_request!
return render_404 unless can?(current_user, :update_merge_request, @merge_request)
2014-09-02 18:07:02 +05:30
end
def authorize_admin_merge_request!
return render_404 unless can?(current_user, :admin_merge_request, @merge_request)
end
2016-09-13 17:45:13 +05:30
def authorize_can_resolve_conflicts!
return render_404 unless @merge_request.conflicts_can_be_resolved_by?(current_user)
end
2014-09-02 18:07:02 +05:30
def module_enabled
2016-09-29 09:46:39 +05:30
return render_404 unless @project.feature_available?(:merge_requests, current_user)
2014-09-02 18:07:02 +05:30
end
def validates_merge_request
# 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?
end
end
def define_show_vars
@noteable = @merge_request
2016-08-24 12:49:21 +05:30
@commits_count = @merge_request.commits.count
2015-04-26 12:48:37 +05:30
if @merge_request.locked_long_ago?
@merge_request.unlock_mr
@merge_request.close
end
2016-11-03 12:29:30 +05:30
2016-11-24 13:41:30 +05:30
labels
2016-11-03 12:29:30 +05:30
define_pipelines_vars
2014-09-02 18:07:02 +05:30
end
2016-08-24 12:49:21 +05:30
# 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
2016-09-13 17:45:13 +05:30
@note = @project.notes.new(noteable: @merge_request)
2016-08-24 12:49:21 +05:30
2016-09-13 17:45:13 +05:30
@discussions = @merge_request.discussions
preload_noteable_for_regular_notes(@discussions.flat_map(&:notes))
2016-08-24 12:49:21 +05:30
# This is not executed lazily
@notes = Banzai::NoteRenderer.render(
2016-09-13 17:45:13 +05:30
@discussions.flat_map(&:notes),
2016-08-24 12:49:21 +05:30
@project,
current_user,
@path,
@project_wiki,
@ref
)
2016-09-13 17:45:13 +05:30
preload_max_access_for_authors(@notes, @project)
2016-08-24 12:49:21 +05:30
end
2015-12-23 02:04:40 +05:30
def define_widget_vars
@pipeline = @merge_request.pipeline
2016-08-24 12:49:21 +05:30
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
}
2016-09-13 17:45:13 +05:30
@use_legacy_diff_notes = !@merge_request.has_complete_diff_refs?
@grouped_diff_discussions = @merge_request.notes.inc_relations_for_view.grouped_diff_discussions
2016-08-24 12:49:21 +05:30
Banzai::NoteRenderer.render(
2016-09-13 17:45:13 +05:30
@grouped_diff_discussions.values.flat_map(&:notes),
2016-08-24 12:49:21 +05:30
@project,
current_user,
@path,
@project_wiki,
@ref
)
2015-12-23 02:04:40 +05:30
end
2016-11-03 12:29:30 +05:30
def define_pipelines_vars
@pipelines = @merge_request.all_pipelines
if @pipelines.present?
@pipeline = @pipelines.first
@statuses = @pipeline.statuses.relevant
end
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
define_pipelines_vars
end
2014-09-02 18:07:02 +05:30
def invalid_mr
2016-11-03 12:29:30 +05:30
# Render special view for MR with removed target branch
2014-09-02 18:07:02 +05:30
render 'invalid'
end
def merge_request_params
2015-12-23 02:04:40 +05:30
params.require(:merge_request).permit(
2014-09-02 18:07:02 +05:30
:title, :assignee_id, :source_project_id, :source_branch,
:target_project_id, :target_branch, :milestone_id,
2016-06-02 11:05:42 +05:30
:state_event, :description, :task_num, :force_remove_source_branch,
2016-09-29 09:46:39 +05:30
:lock_version, label_ids: []
2014-09-02 18:07:02 +05:30
)
2015-12-23 02:04:40 +05:30
end
def merge_params
params.permit(:should_remove_source_branch, :commit_message)
2014-09-02 18:07:02 +05:30
end
2015-09-25 12:07:36 +05:30
# 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
2016-08-24 12:49:21 +05:30
def merge_when_build_succeeds_active?
params[:merge_when_build_succeeds].present? &&
@merge_request.pipeline && @merge_request.pipeline.active?
end
def build_merge_request
params[:merge_request] ||= ActionController::Parameters.new(source_project: @project)
2016-11-03 12:29:30 +05:30
@merge_request = MergeRequests::BuildService.new(project, current_user, merge_request_params.merge(diff_options: diff_options)).execute
2016-08-24 12:49:21 +05:30
end
2016-09-29 09:46:39 +05:30
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
2016-11-03 12:29:30 +05:30
def close_merge_request_without_source_project
if !@merge_request.source_project && @merge_request.open?
@merge_request.close
end
end
2014-09-02 18:07:02 +05:30
end