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

345 lines
9.9 KiB
Ruby
Raw Normal View History

2017-09-10 17:25:29 +05:30
class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationController
2016-06-02 11:05:42 +05:30
include ToggleSubscriptionAction
include IssuableActions
2017-08-17 22:00:37 +05:30
include RendersNotes
2018-03-17 18:26:18 +05:30
include RendersCommits
include ToggleAwardEmoji
2016-09-13 17:45:13 +05:30
include IssuableCollections
2016-06-02 11:05:42 +05:30
2017-09-10 17:25:29 +05:30
skip_before_action :merge_request, only: [:index, :bulk_update]
2018-03-17 18:26:18 +05:30
before_action :whitelist_query_limiting, only: [:assign_related_issues, :update]
before_action :authorize_update_issuable!, only: [:close, :edit, :update, :remove_wip, :sort]
before_action :set_issuables_index, only: [:index]
2016-11-03 12:29:30 +05:30
before_action :authenticate_user!, only: [:assign_related_issues]
2018-03-17 18:26:18 +05:30
before_action :check_user_can_push_to_source_branch!, only: [:rebase]
2016-11-03 12:29:30 +05:30
2014-09-02 18:07:02 +05:30
def index
2018-03-17 18:26:18 +05:30
@merge_requests = @issuables
2017-08-17 22:00:37 +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
2017-09-10 17:25:29 +05:30
validates_merge_request
close_merge_request_without_source_project
check_if_can_be_merged
2018-03-17 18:26:18 +05:30
# Return if the response has already been rendered
return if response_body
2014-09-02 18:07:02 +05:30
respond_to do |format|
2017-08-17 22:00:37 +05:30
format.html do
2017-09-10 17:25:29 +05:30
# Build a note object for comment form
@note = @project.notes.new(noteable: @merge_request)
@noteable = @merge_request
@commits_count = @merge_request.commits_count
2018-03-17 18:26:18 +05:30
@discussions = @merge_request.discussions
@notes = prepare_notes_for_rendering(@discussions.flat_map(&:notes), @noteable)
2017-09-10 17:25:29 +05:30
labels
set_pipeline_variables
2018-03-17 18:26:18 +05:30
render
2017-08-17 22:00:37 +05:30
end
2016-08-24 12:49:21 +05:30
format.json do
2017-08-17 22:00:37 +05:30
Gitlab::PollingInterval.set_header(response, interval: 10_000)
2018-03-17 18:26:18 +05:30
render json: serializer.represent(@merge_request, serializer: params[:serializer])
2016-08-24 12:49:21 +05:30
end
format.patch do
2018-10-15 14:42:47 +05:30
break render_404 unless @merge_request.diff_refs
2016-08-24 12:49:21 +05:30
send_git_patch @project.repository, @merge_request.diff_refs
end
format.diff do
2018-10-15 14:42:47 +05:30
break 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
2015-09-11 14:41:01 +05:30
def commits
2017-09-10 17:25:29 +05:30
# Get commits from repository
# or from cache if already merged
2018-03-17 18:26:18 +05:30
@commits =
prepare_commits_for_rendering(@merge_request.commits.with_pipeline_status)
2016-11-03 12:29:30 +05:30
2017-09-10 17:25:29 +05:30
render json: { html: view_to_html_string('projects/merge_requests/_commits') }
2016-09-13 17:45:13 +05:30
end
def pipelines
@pipelines = @merge_request.all_pipelines
2017-09-10 17:25:29 +05:30
Gitlab::PollingInterval.set_header(response, interval: 10_000)
2017-08-17 22:00:37 +05:30
2017-09-10 17:25:29 +05:30
render json: {
pipelines: PipelineSerializer
.new(project: @project, current_user: @current_user)
.represent(@pipelines),
count: {
all: @pipelines.count
}
}
2014-09-02 18:07:02 +05:30
end
2015-12-23 02:04:40 +05:30
def edit
2017-09-10 17:25:29 +05:30
define_edit_vars
2015-12-23 02:04:40 +05:30
end
2014-09-02 18:07:02 +05:30
def update
2017-09-10 17:25:29 +05:30
@merge_request = ::MergeRequests::UpdateService.new(project, current_user, merge_request_params).execute(@merge_request)
2014-09-02 18:07:02 +05:30
2017-08-17 22:00:37 +05:30
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
2017-09-10 17:25:29 +05:30
define_edit_vars
2017-08-17 22:00:37 +05:30
render :edit
2014-09-02 18:07:02 +05:30
end
end
2017-08-17 22:00:37 +05:30
format.json do
render json: @merge_request.to_json(include: { milestone: {}, assignee: { only: [:name, :username], methods: [:avatar_url] }, labels: { methods: :text_color } }, methods: [:task_status, :task_status_short])
end
2014-09-02 18:07:02 +05:30
end
2016-09-29 09:46:39 +05:30
rescue ActiveRecord::StaleObjectError
2017-09-10 17:25:29 +05:30
define_edit_vars if request.format.html?
2017-08-17 22:00:37 +05:30
render_conflict_response
2014-09-02 18:07:02 +05:30
end
2016-06-02 11:05:42 +05:30
def remove_wip
2017-09-10 17:25:29 +05:30
@merge_request = ::MergeRequests::UpdateService
2017-08-17 22:00:37 +05:30
.new(project, current_user, wip_event: 'unwip')
.execute(@merge_request)
2016-06-02 11:05:42 +05:30
2018-03-17 18:26:18 +05:30
render json: serialize_widget(@merge_request)
2016-06-02 11:05:42 +05:30
end
2017-08-17 22:00:37 +05:30
def commit_change_content
render partial: 'projects/merge_requests/widget/commit_change_content', layout: false
2014-09-02 18:07:02 +05:30
end
2017-08-17 22:00:37 +05:30
def cancel_merge_when_pipeline_succeeds
unless @merge_request.can_cancel_merge_when_pipeline_succeeds?(current_user)
return access_denied!
end
2017-09-10 17:25:29 +05:30
::MergeRequests::MergeWhenPipelineSucceedsService
2017-08-17 22:00:37 +05:30
.new(@project, current_user)
.cancel(@merge_request)
2015-12-23 02:04:40 +05:30
2018-03-17 18:26:18 +05:30
render json: serialize_widget(@merge_request)
2015-12-23 02:04:40 +05:30
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
2017-08-17 22:00:37 +05:30
status = merge!
2015-12-23 02:04:40 +05:30
2017-08-17 22:00:37 +05:30
if @merge_request.merge_error
render json: { status: status, merge_error: @merge_request.merge_error }
2014-09-02 18:07:02 +05:30
else
2017-08-17 22:00:37 +05:30
render json: { status: status }
2014-09-02 18:07:02 +05:30
end
end
2016-11-03 12:29:30 +05:30
def assign_related_issues
2017-09-10 17:25:29 +05:30
result = ::MergeRequests::AssignIssuesService.new(project, current_user, merge_request: @merge_request).execute
2016-11-03 12:29:30 +05:30
2017-09-10 17:25:29 +05:30
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"
2016-11-03 12:29:30 +05:30
end
2017-09-10 17:25:29 +05:30
redirect_to(merge_request_path(@merge_request))
2016-11-03 12:29:30 +05:30
end
2017-08-17 22:00:37 +05:30
def pipeline_status
render json: PipelineSerializer
.new(project: @project, current_user: @current_user)
.represent_status(@merge_request.head_pipeline)
2014-09-02 18:07:02 +05:30
end
2016-11-03 12:29:30 +05:30
def ci_environments_status
environments =
begin
2017-08-17 22:00:37 +05:30
@merge_request.environments_for(current_user).map do |environment|
2016-11-03 12:29:30 +05:30
project = environment.project
2018-03-27 19:54:05 +05:30
deployment = environment.first_deployment_for(@merge_request.diff_head_sha)
2016-11-03 12:29:30 +05:30
stop_url =
2017-08-17 22:00:37 +05:30
if environment.stop_action? && can?(current_user, :create_deployment, environment)
2017-09-10 17:25:29 +05:30
stop_project_environment_path(project, environment)
2016-11-03 12:29:30 +05:30
end
2017-08-17 22:00:37 +05:30
metrics_url =
if can?(current_user, :read_environment, environment) && environment.has_metrics?
2017-09-10 17:25:29 +05:30
metrics_project_environment_deployment_path(environment.project, environment, deployment)
end
2018-03-17 18:26:18 +05:30
metrics_monitoring_url =
2017-09-10 17:25:29 +05:30
if can?(current_user, :read_environment, environment)
environment_metrics_path(environment)
2017-08-17 22:00:37 +05:30
end
2016-11-03 12:29:30 +05:30
{
id: environment.id,
name: environment.name,
2017-09-10 17:25:29 +05:30
url: project_environment_path(project, environment),
2017-08-17 22:00:37 +05:30
metrics_url: metrics_url,
2017-09-10 17:25:29 +05:30
metrics_monitoring_url: metrics_monitoring_url,
2016-11-03 12:29:30 +05:30
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
2018-03-17 18:26:18 +05:30
def rebase
RebaseWorker.perform_async(@merge_request.id, current_user.id)
render nothing: true, status: 200
end
2014-09-02 18:07:02 +05:30
protected
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
def validates_merge_request
# Show git not found page
# if there is no saved commits between source & target branch
2017-08-17 22:00:37 +05:30
if @merge_request.has_no_commits?
2014-09-02 18:07:02 +05:30
# and if target branch doesn't exist
return invalid_mr unless @merge_request.target_branch_exists?
end
end
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
2015-12-23 02:04:40 +05:30
def merge_params
2017-09-10 17:25:29 +05:30
params.permit(merge_params_attributes)
2014-09-02 18:07:02 +05:30
end
2015-09-25 12:07:36 +05:30
2017-09-10 17:25:29 +05:30
def merge_params_attributes
[:should_remove_source_branch, :commit_message]
2015-09-25 12:07:36 +05:30
end
2016-08-24 12:49:21 +05:30
2017-08-17 22:00:37 +05:30
def merge_when_pipeline_succeeds_active?
params[:merge_when_pipeline_succeeds].present? &&
@merge_request.head_pipeline && @merge_request.head_pipeline.active?
2016-08-24 12:49:21 +05:30
end
2017-08-17 22:00:37 +05:30
def close_merge_request_without_source_project
if !@merge_request.source_project && @merge_request.open?
@merge_request.close
end
2016-09-29 09:46:39 +05:30
end
2017-08-17 22:00:37 +05:30
private
def check_if_can_be_merged
@merge_request.check_if_can_be_merged
2016-09-29 09:46:39 +05:30
end
2016-11-03 12:29:30 +05:30
2017-08-17 22:00:37 +05:30
def merge!
# Disable the CI check if merge_when_pipeline_succeeds is enabled since we have
# to wait until CI completes to know
unless @merge_request.mergeable?(skip_ci_check: merge_when_pipeline_succeeds_active?)
return :failed
2016-11-03 12:29:30 +05:30
end
2017-08-17 22:00:37 +05:30
return :sha_mismatch if params[:sha] != @merge_request.diff_head_sha
@merge_request.update(merge_error: nil)
if params[:merge_when_pipeline_succeeds].present?
2018-03-17 18:26:18 +05:30
return :failed unless @merge_request.actual_head_pipeline
2017-08-17 22:00:37 +05:30
2018-03-17 18:26:18 +05:30
if @merge_request.actual_head_pipeline.active?
2017-09-10 17:25:29 +05:30
::MergeRequests::MergeWhenPipelineSucceedsService
2017-08-17 22:00:37 +05:30
.new(@project, current_user, merge_params)
.execute(@merge_request)
:merge_when_pipeline_succeeds
2018-03-17 18:26:18 +05:30
elsif @merge_request.actual_head_pipeline.success?
2017-08-17 22:00:37 +05:30
# This can be triggered when a user clicks the auto merge button while
# the tests finish at about the same time
2018-03-17 18:26:18 +05:30
@merge_request.merge_async(current_user.id, params)
2017-08-17 22:00:37 +05:30
:success
else
:failed
end
else
2018-03-17 18:26:18 +05:30
@merge_request.merge_async(current_user.id, params)
2017-08-17 22:00:37 +05:30
:success
end
end
2018-03-17 18:26:18 +05:30
def serialize_widget(merge_request)
serializer.represent(merge_request, serializer: 'widget')
end
2017-08-17 22:00:37 +05:30
def serializer
MergeRequestSerializer.new(current_user: current_user, project: merge_request.project)
2016-11-03 12:29:30 +05:30
end
2017-09-10 17:25:29 +05:30
def define_edit_vars
@source_project = @merge_request.source_project
@target_project = @merge_request.target_project
@target_branches = @merge_request.target_project.repository.branch_names
end
2018-03-17 18:26:18 +05:30
2018-03-27 19:54:05 +05:30
def finder_type
MergeRequestsFinder
2018-03-17 18:26:18 +05:30
end
def check_user_can_push_to_source_branch!
return access_denied! unless @merge_request.source_branch_exists?
access_check = ::Gitlab::UserAccess
.new(current_user, project: @merge_request.source_project)
.can_push_to_branch?(@merge_request.source_branch)
access_denied! unless access_check
end
def whitelist_query_limiting
# Also see https://gitlab.com/gitlab-org/gitlab-ce/issues/42441
Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/42438')
end
2014-09-02 18:07:02 +05:30
end