2017-06-13 22:12:31 +00:00
|
|
|
class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationController
|
2016-03-15 16:18:47 +00:00
|
|
|
include ToggleSubscriptionAction
|
2016-03-21 13:12:52 +00:00
|
|
|
include IssuableActions
|
2017-03-31 03:06:09 +00:00
|
|
|
include RendersNotes
|
2017-08-23 16:53:29 +00:00
|
|
|
include RendersCommits
|
2016-04-16 19:09:08 +00:00
|
|
|
include ToggleAwardEmoji
|
2016-07-23 23:28:12 +00:00
|
|
|
include IssuableCollections
|
2016-03-03 17:38:44 +00:00
|
|
|
|
2017-06-13 22:12:31 +00:00
|
|
|
skip_before_action :merge_request, only: [:index, :bulk_update]
|
|
|
|
|
2017-11-01 17:35:14 +00:00
|
|
|
before_action :authorize_update_issuable!, only: [:close, :edit, :update, :remove_wip, :sort]
|
2011-12-15 21:57:46 +00:00
|
|
|
|
2017-11-07 13:34:12 +00:00
|
|
|
before_action :set_issuables_index, only: [:index]
|
|
|
|
|
2016-10-07 16:16:42 +00:00
|
|
|
before_action :authenticate_user!, only: [:assign_related_issues]
|
|
|
|
|
2011-11-28 07:39:43 +00:00
|
|
|
def index
|
2017-11-07 13:34:12 +00:00
|
|
|
@merge_requests = @issuables
|
2017-02-15 22:13:53 +00:00
|
|
|
|
2015-03-12 23:20:58 +00:00
|
|
|
respond_to do |format|
|
|
|
|
format.html
|
|
|
|
format.json do
|
|
|
|
render json: {
|
2016-04-20 12:55:19 +00:00
|
|
|
html: view_to_html_string("projects/merge_requests/_merge_requests"),
|
2016-04-20 16:00:12 +00:00
|
|
|
labels: @labels.as_json(methods: :text_color)
|
2015-03-12 23:20:58 +00:00
|
|
|
}
|
|
|
|
end
|
|
|
|
end
|
2011-11-28 07:39:43 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
def show
|
2017-06-13 22:12:31 +00:00
|
|
|
validates_merge_request
|
|
|
|
close_merge_request_without_source_project
|
|
|
|
check_if_can_be_merged
|
|
|
|
|
2017-09-19 10:55:37 +00:00
|
|
|
# Return if the response has already been rendered
|
|
|
|
return if response_body
|
|
|
|
|
2011-11-28 20:16:57 +00:00
|
|
|
respond_to do |format|
|
2017-05-09 04:15:34 +00:00
|
|
|
format.html do
|
2017-06-13 22:12:31 +00:00
|
|
|
# Build a note object for comment form
|
|
|
|
@note = @project.notes.new(noteable: @merge_request)
|
|
|
|
|
|
|
|
@noteable = @merge_request
|
|
|
|
@commits_count = @merge_request.commits_count
|
|
|
|
|
2017-07-29 15:04:42 +00:00
|
|
|
@discussions = @merge_request.discussions
|
|
|
|
@notes = prepare_notes_for_rendering(@discussions.flat_map(&:notes), @noteable)
|
|
|
|
|
2017-06-13 22:12:31 +00:00
|
|
|
labels
|
|
|
|
|
|
|
|
set_pipeline_variables
|
2017-09-19 10:55:37 +00:00
|
|
|
|
|
|
|
# n+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/37432
|
|
|
|
Gitlab::GitalyClient.allow_n_plus_1_calls do
|
|
|
|
render
|
|
|
|
end
|
2017-05-09 04:15:34 +00:00
|
|
|
end
|
2016-06-28 16:25:32 +00:00
|
|
|
|
2016-07-03 21:01:13 +00:00
|
|
|
format.json do
|
2017-05-18 20:14:48 +00:00
|
|
|
Gitlab::PollingInterval.set_header(response, interval: 10_000)
|
|
|
|
|
2017-10-31 16:15:03 +00:00
|
|
|
render json: serializer.represent(@merge_request, serializer: params[:serializer])
|
2016-07-03 21:01:13 +00:00
|
|
|
end
|
|
|
|
|
2016-06-10 12:57:50 +00:00
|
|
|
format.patch do
|
2016-07-03 21:01:13 +00:00
|
|
|
return render_404 unless @merge_request.diff_refs
|
|
|
|
|
|
|
|
send_git_patch @project.repository, @merge_request.diff_refs
|
2016-06-10 12:57:50 +00:00
|
|
|
end
|
2016-07-03 21:01:13 +00:00
|
|
|
|
2016-05-12 18:50:49 +00:00
|
|
|
format.diff do
|
2016-06-08 12:30:15 +00:00
|
|
|
return render_404 unless @merge_request.diff_refs
|
2016-05-12 18:50:49 +00:00
|
|
|
|
2016-06-08 12:30:15 +00:00
|
|
|
send_git_diff @project.repository, @merge_request.diff_refs
|
2016-05-12 18:50:49 +00:00
|
|
|
end
|
2012-11-22 20:50:36 +00:00
|
|
|
end
|
2012-07-04 22:26:23 +00:00
|
|
|
end
|
|
|
|
|
2015-05-29 04:09:28 +00:00
|
|
|
def commits
|
2017-06-13 22:12:31 +00:00
|
|
|
# Get commits from repository
|
|
|
|
# or from cache if already merged
|
2017-11-10 19:57:11 +00:00
|
|
|
@commits =
|
|
|
|
prepare_commits_for_rendering(@merge_request.commits.with_pipeline_status)
|
2016-08-04 13:56:54 +00:00
|
|
|
|
2017-06-13 22:12:31 +00:00
|
|
|
render json: { html: view_to_html_string('projects/merge_requests/_commits') }
|
2016-07-27 16:54:04 +00:00
|
|
|
end
|
|
|
|
|
2016-07-23 00:28:39 +00:00
|
|
|
def pipelines
|
2016-08-12 14:22:48 +00:00
|
|
|
@pipelines = @merge_request.all_pipelines
|
2016-07-26 00:30:52 +00:00
|
|
|
|
2017-06-13 22:12:31 +00:00
|
|
|
Gitlab::PollingInterval.set_header(response, interval: 10_000)
|
2017-04-05 14:36:14 +00:00
|
|
|
|
2017-07-14 15:52:54 +00:00
|
|
|
render json: {
|
|
|
|
pipelines: PipelineSerializer
|
|
|
|
.new(project: @project, current_user: @current_user)
|
|
|
|
.represent(@pipelines),
|
|
|
|
count: {
|
|
|
|
all: @pipelines.count
|
|
|
|
}
|
|
|
|
}
|
2011-11-28 07:39:43 +00:00
|
|
|
end
|
|
|
|
|
2015-12-08 12:04:24 +00:00
|
|
|
def edit
|
2017-06-13 22:12:31 +00:00
|
|
|
define_edit_vars
|
2015-12-08 12:04:24 +00:00
|
|
|
end
|
|
|
|
|
2011-11-28 07:39:43 +00:00
|
|
|
def update
|
2017-06-13 22:12:31 +00:00
|
|
|
@merge_request = ::MergeRequests::UpdateService.new(project, current_user, merge_request_params).execute(@merge_request)
|
2014-02-18 14:24:19 +00:00
|
|
|
|
2017-01-16 18:43:03 +00:00
|
|
|
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-06-13 22:12:31 +00:00
|
|
|
define_edit_vars
|
|
|
|
|
2017-01-16 18:43:03 +00:00
|
|
|
render :edit
|
2015-03-06 13:03:41 +00:00
|
|
|
end
|
2014-02-18 14:24:19 +00:00
|
|
|
end
|
2017-01-16 18:43:03 +00:00
|
|
|
|
|
|
|
format.json do
|
2017-03-18 04:23:15 +00:00
|
|
|
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])
|
2017-01-16 18:43:03 +00:00
|
|
|
end
|
2011-11-28 07:39:43 +00:00
|
|
|
end
|
2016-08-01 15:34:17 +00:00
|
|
|
rescue ActiveRecord::StaleObjectError
|
2017-06-13 22:12:31 +00:00
|
|
|
define_edit_vars if request.format.html?
|
|
|
|
|
2017-01-16 18:43:03 +00:00
|
|
|
render_conflict_response
|
2011-11-28 07:39:43 +00:00
|
|
|
end
|
|
|
|
|
2016-02-27 03:34:32 +00:00
|
|
|
def remove_wip
|
2017-06-13 22:12:31 +00:00
|
|
|
@merge_request = ::MergeRequests::UpdateService
|
2017-05-09 04:15:34 +00:00
|
|
|
.new(project, current_user, wip_event: 'unwip')
|
|
|
|
.execute(@merge_request)
|
2016-02-27 03:34:32 +00:00
|
|
|
|
2017-05-09 04:15:34 +00:00
|
|
|
render json: serializer.represent(@merge_request)
|
2016-02-27 03:34:32 +00:00
|
|
|
end
|
|
|
|
|
2017-05-09 04:15:34 +00:00
|
|
|
def commit_change_content
|
|
|
|
render partial: 'projects/merge_requests/widget/commit_change_content', layout: false
|
2012-04-16 19:08:03 +00:00
|
|
|
end
|
|
|
|
|
2017-02-17 13:56:13 +00:00
|
|
|
def cancel_merge_when_pipeline_succeeds
|
|
|
|
unless @merge_request.can_cancel_merge_when_pipeline_succeeds?(current_user)
|
2016-10-27 12:04:43 +00:00
|
|
|
return access_denied!
|
|
|
|
end
|
2015-11-02 16:27:38 +00:00
|
|
|
|
2017-06-13 22:12:31 +00:00
|
|
|
::MergeRequests::MergeWhenPipelineSucceedsService
|
2017-02-22 22:54:59 +00:00
|
|
|
.new(@project, current_user)
|
|
|
|
.cancel(@merge_request)
|
2017-05-09 04:15:34 +00:00
|
|
|
|
|
|
|
render json: serializer.represent(@merge_request)
|
2015-11-02 16:27:38 +00:00
|
|
|
end
|
|
|
|
|
2015-08-11 12:33:31 +00:00
|
|
|
def merge
|
2015-06-11 16:45:12 +00:00
|
|
|
return access_denied! unless @merge_request.can_be_merged_by?(current_user)
|
2013-02-27 18:20:31 +00:00
|
|
|
|
2017-05-09 04:15:34 +00:00
|
|
|
status = merge!
|
2015-11-02 16:27:38 +00:00
|
|
|
|
2017-05-09 04:15:34 +00:00
|
|
|
if @merge_request.merge_error
|
|
|
|
render json: { status: status, merge_error: @merge_request.merge_error }
|
2012-04-16 20:05:08 +00:00
|
|
|
else
|
2017-05-09 04:15:34 +00:00
|
|
|
render json: { status: status }
|
2012-04-16 20:05:08 +00:00
|
|
|
end
|
2012-03-29 15:03:05 +00:00
|
|
|
end
|
|
|
|
|
2016-08-08 22:30:01 +00:00
|
|
|
def assign_related_issues
|
2017-06-13 22:12:31 +00:00
|
|
|
result = ::MergeRequests::AssignIssuesService.new(project, current_user, merge_request: @merge_request).execute
|
2016-08-08 22:30:01 +00:00
|
|
|
|
2017-06-13 22:12:31 +00:00
|
|
|
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-08-08 22:30:01 +00:00
|
|
|
end
|
2017-06-13 22:12:31 +00:00
|
|
|
|
|
|
|
redirect_to(merge_request_path(@merge_request))
|
2016-08-08 22:30:01 +00:00
|
|
|
end
|
|
|
|
|
2017-03-17 06:58:12 +00:00
|
|
|
def pipeline_status
|
2017-02-27 19:17:21 +00:00
|
|
|
render json: PipelineSerializer
|
2017-05-09 04:15:34 +00:00
|
|
|
.new(project: @project, current_user: @current_user)
|
2017-03-10 17:44:41 +00:00
|
|
|
.represent_status(@merge_request.head_pipeline)
|
2017-02-27 19:17:21 +00:00
|
|
|
end
|
|
|
|
|
2016-10-07 22:10:06 +00:00
|
|
|
def ci_environments_status
|
2016-10-12 13:21:01 +00:00
|
|
|
environments =
|
2016-10-10 18:38:48 +00:00
|
|
|
begin
|
2017-02-07 00:06:46 +00:00
|
|
|
@merge_request.environments_for(current_user).map do |environment|
|
2016-10-13 12:23:18 +00:00
|
|
|
project = environment.project
|
2016-10-10 18:38:48 +00:00
|
|
|
deployment = environment.first_deployment_for(@merge_request.diff_head_commit)
|
|
|
|
|
2016-10-18 09:22:22 +00:00
|
|
|
stop_url =
|
2017-02-07 12:30:33 +00:00
|
|
|
if environment.stop_action? && can?(current_user, :create_deployment, environment)
|
2017-06-29 17:06:35 +00:00
|
|
|
stop_project_environment_path(project, environment)
|
2016-10-18 09:22:22 +00:00
|
|
|
end
|
|
|
|
|
2017-05-09 04:15:34 +00:00
|
|
|
metrics_url =
|
|
|
|
if can?(current_user, :read_environment, environment) && environment.has_metrics?
|
2017-06-29 17:06:35 +00:00
|
|
|
metrics_project_environment_deployment_path(environment.project, environment, deployment)
|
2017-05-09 04:15:34 +00:00
|
|
|
end
|
2017-08-15 17:44:37 +00:00
|
|
|
|
|
|
|
metrics_monitoring_url =
|
2017-07-26 09:31:17 +00:00
|
|
|
if can?(current_user, :read_environment, environment)
|
|
|
|
environment_metrics_path(environment)
|
|
|
|
end
|
2017-05-09 04:15:34 +00:00
|
|
|
|
2016-10-12 13:21:01 +00:00
|
|
|
{
|
2016-10-10 18:38:48 +00:00
|
|
|
id: environment.id,
|
2016-10-12 13:21:01 +00:00
|
|
|
name: environment.name,
|
2017-06-29 17:06:35 +00:00
|
|
|
url: project_environment_path(project, environment),
|
2017-05-09 04:15:34 +00:00
|
|
|
metrics_url: metrics_url,
|
2017-07-26 09:31:17 +00:00
|
|
|
metrics_monitoring_url: metrics_monitoring_url,
|
2016-10-18 09:22:22 +00:00
|
|
|
stop_url: stop_url,
|
2016-10-10 18:38:48 +00:00
|
|
|
external_url: environment.external_url,
|
2016-10-12 13:21:01 +00:00
|
|
|
external_url_formatted: environment.formatted_external_url,
|
|
|
|
deployed_at: deployment.try(:created_at),
|
|
|
|
deployed_at_formatted: deployment.try(:formatted_deployment_time)
|
2016-10-10 18:38:48 +00:00
|
|
|
}
|
|
|
|
end.compact
|
2016-10-04 14:03:13 +00:00
|
|
|
end
|
2016-10-05 11:52:15 +00:00
|
|
|
|
2016-10-10 18:38:48 +00:00
|
|
|
render json: environments
|
2012-12-11 03:14:05 +00:00
|
|
|
end
|
|
|
|
|
2011-11-28 07:39:43 +00:00
|
|
|
protected
|
|
|
|
|
2016-03-15 16:18:47 +00:00
|
|
|
alias_method :subscribable_resource, :merge_request
|
2016-03-21 13:12:52 +00:00
|
|
|
alias_method :issuable, :merge_request
|
2016-04-16 19:09:08 +00:00
|
|
|
alias_method :awardable, :merge_request
|
2011-12-15 21:57:46 +00:00
|
|
|
|
2012-06-29 18:55:22 +00:00
|
|
|
def validates_merge_request
|
2013-07-31 16:31:34 +00:00
|
|
|
# Show git not found page
|
|
|
|
# if there is no saved commits between source & target branch
|
2016-12-01 11:17:30 +00:00
|
|
|
if @merge_request.has_no_commits?
|
2013-12-12 09:34:42 +00:00
|
|
|
# and if target branch doesn't exist
|
|
|
|
return invalid_mr unless @merge_request.target_branch_exists?
|
2013-07-31 16:31:34 +00:00
|
|
|
end
|
2012-06-29 18:55:22 +00:00
|
|
|
end
|
|
|
|
|
2013-11-27 08:17:29 +00:00
|
|
|
def invalid_mr
|
2016-09-26 11:49:20 +00:00
|
|
|
# Render special view for MR with removed target branch
|
2013-11-27 08:17:29 +00:00
|
|
|
render 'invalid'
|
|
|
|
end
|
|
|
|
|
2015-11-02 16:27:38 +00:00
|
|
|
def merge_params
|
2017-06-21 15:30:45 +00:00
|
|
|
params.permit(merge_params_attributes)
|
|
|
|
end
|
|
|
|
|
|
|
|
def merge_params_attributes
|
|
|
|
[:should_remove_source_branch, :commit_message]
|
2015-11-02 16:27:38 +00:00
|
|
|
end
|
|
|
|
|
2017-02-17 13:56:13 +00:00
|
|
|
def merge_when_pipeline_succeeds_active?
|
|
|
|
params[:merge_when_pipeline_succeeds].present? &&
|
2016-11-28 10:13:32 +00:00
|
|
|
@merge_request.head_pipeline && @merge_request.head_pipeline.active?
|
2016-06-24 16:13:56 +00:00
|
|
|
end
|
2016-06-28 16:25:32 +00:00
|
|
|
|
2016-09-26 11:49:20 +00:00
|
|
|
def close_merge_request_without_source_project
|
|
|
|
if !@merge_request.source_project && @merge_request.open?
|
|
|
|
@merge_request.close
|
|
|
|
end
|
|
|
|
end
|
2017-05-09 04:15:34 +00:00
|
|
|
|
|
|
|
private
|
|
|
|
|
2017-05-18 20:14:48 +00:00
|
|
|
def check_if_can_be_merged
|
|
|
|
@merge_request.check_if_can_be_merged
|
|
|
|
end
|
|
|
|
|
2017-05-09 04:15:34 +00:00
|
|
|
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
|
|
|
|
end
|
|
|
|
|
|
|
|
return :sha_mismatch if params[:sha] != @merge_request.diff_head_sha
|
|
|
|
|
|
|
|
@merge_request.update(merge_error: nil)
|
|
|
|
|
|
|
|
if params[:merge_when_pipeline_succeeds].present?
|
|
|
|
return :failed unless @merge_request.head_pipeline
|
|
|
|
|
|
|
|
if @merge_request.head_pipeline.active?
|
2017-06-13 22:12:31 +00:00
|
|
|
::MergeRequests::MergeWhenPipelineSucceedsService
|
2017-05-09 04:15:34 +00:00
|
|
|
.new(@project, current_user, merge_params)
|
|
|
|
.execute(@merge_request)
|
|
|
|
|
|
|
|
:merge_when_pipeline_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
|
2017-08-28 18:55:25 +00:00
|
|
|
@merge_request.merge_async(current_user.id, params)
|
2017-05-09 04:15:34 +00:00
|
|
|
|
|
|
|
:success
|
|
|
|
else
|
|
|
|
:failed
|
|
|
|
end
|
|
|
|
else
|
2017-08-28 18:55:25 +00:00
|
|
|
@merge_request.merge_async(current_user.id, params)
|
2017-05-09 04:15:34 +00:00
|
|
|
|
|
|
|
:success
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
def serializer
|
|
|
|
MergeRequestSerializer.new(current_user: current_user, project: merge_request.project)
|
|
|
|
end
|
2017-06-13 22:12:31 +00:00
|
|
|
|
|
|
|
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
|
2017-11-07 13:34:12 +00:00
|
|
|
|
|
|
|
def set_issuables_index
|
|
|
|
@finder_type = MergeRequestsFinder
|
|
|
|
super
|
|
|
|
end
|
2011-11-28 07:39:43 +00:00
|
|
|
end
|