gitlab-org--gitlab-foss/app/controllers/projects/merge_requests/creations_controller.rb

143 lines
4.1 KiB
Ruby
Raw Normal View History

# frozen_string_literal: true
2017-06-13 18:12:31 -04:00
class Projects::MergeRequests::CreationsController < Projects::MergeRequests::ApplicationController
include DiffForPath
include DiffHelper
include RendersCommits
2017-06-13 18:12:31 -04:00
skip_before_action :merge_request
before_action :authorize_create_merge_request_from!
2017-06-13 18:12:31 -04:00
before_action :apply_diff_view_cookie!, only: [:diffs, :diff_for_path]
before_action :build_merge_request, except: [:create]
before_action do
push_frontend_feature_flag(:mr_collapsed_approval_rules, @project)
end
2017-06-13 18:12:31 -04:00
def new
define_new_vars
2017-06-13 18:12:31 -04:00
end
def create
@merge_request = ::MergeRequests::CreateService.new(project, current_user, merge_request_params).execute
if @merge_request.valid?
incr_count_webide_merge_request
2017-06-13 18:12:31 -04:00
redirect_to(merge_request_path(@merge_request))
else
@source_project = @merge_request.source_project
@target_project = @merge_request.target_project
define_new_vars
render action: "new"
end
end
def pipelines
@pipelines = Ci::PipelinesForMergeRequestFinder.new(@merge_request, current_user).execute
2017-06-13 18:12:31 -04:00
Gitlab::PollingInterval.set_header(response, interval: 10_000)
render json: {
pipelines: PipelineSerializer
.new(project: @project, current_user: current_user)
2017-06-13 18:12:31 -04:00
.represent(@pipelines)
}
end
def diffs
@diffs = @merge_request.diffs(diff_options) if @merge_request.can_be_created
2017-06-13 18:12:31 -04:00
@diff_notes_disabled = true
@environment = @merge_request.environments_for(current_user, latest: true).last
2017-06-13 18:12:31 -04:00
render json: { html: view_to_html_string('projects/merge_requests/creations/_diffs', diffs: @diffs, environment: @environment) }
end
def diff_for_path
@diffs = @merge_request.diffs(diff_options)
@diff_notes_disabled = true
render_diff_for_path(@diffs)
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(Gitlab::Git::BRANCH_REF_PREFIX + @ref)
2017-06-13 18:12:31 -04:00
end
render layout: false
end
def branch_to
@target_project = selected_target_project
if @target_project && params[:ref].present?
2017-06-13 18:12:31 -04:00
@ref = params[:ref]
@commit = @target_project.commit(Gitlab::Git::BRANCH_REF_PREFIX + @ref)
2017-06-13 18:12:31 -04:00
end
render layout: false
end
private
def build_merge_request
params[:merge_request] ||= ActionController::Parameters.new(source_project: @project)
# Gitaly N+1 issue: https://gitlab.com/gitlab-org/gitlab-foss/issues/58096
Gitlab::GitalyClient.allow_n_plus_1_calls do
@merge_request = ::MergeRequests::BuildService.new(project, current_user, merge_request_params.merge(diff_options: diff_options)).execute
end
2017-06-13 18:12:31 -04:00
end
def define_new_vars
@noteable = @merge_request
@target_project = @merge_request.target_project
@source_project = @merge_request.source_project
@commits =
set_commits_for_rendering(
@merge_request.recent_commits.with_latest_pipeline(@merge_request.source_branch),
commits_count: @merge_request.commits_count
)
2017-06-13 18:12:31 -04:00
@commit = @merge_request.diff_head_commit
2018-09-14 11:59:28 -04:00
# FIXME: We have to assign a presenter to another instance variable
# due to class_name checks being made with issuable classes
2018-09-07 08:29:19 -04:00
@mr_presenter = @merge_request.present(current_user: current_user)
2017-06-13 18:12:31 -04:00
@labels = LabelsFinder.new(current_user, project_id: @project.id).execute
set_pipeline_variables
end
# rubocop: disable CodeReuse/ActiveRecord
2017-06-13 18:12:31 -04:00
def selected_target_project
if @project.id.to_s == params[:target_project_id] || !@project.forked?
2017-06-13 18:12:31 -04:00
@project
elsif params[:target_project_id].present?
MergeRequestTargetProjectFinder.new(current_user: current_user, source_project: @project)
.find_by(id: params[:target_project_id])
2017-06-13 18:12:31 -04:00
else
@project.forked_from_project
2017-06-13 18:12:31 -04:00
end
end
# rubocop: enable CodeReuse/ActiveRecord
def incr_count_webide_merge_request
return if params[:nav_source] != 'webide'
Gitlab::UsageDataCounters::WebIdeCounter.increment_merge_requests_count
end
2017-06-13 18:12:31 -04:00
end
Projects::MergeRequests::CreationsController.prepend_ee_mod