class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationController include ToggleSubscriptionAction include IssuableActions include RendersNotes include RendersCommits include ToggleAwardEmoji include IssuableCollections skip_before_action :merge_request, only: [:index, :bulk_update] 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] before_action :authenticate_user!, only: [:assign_related_issues] before_action :check_user_can_push_to_source_branch!, only: [:rebase] def index @merge_requests = @issuables 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 validates_merge_request close_merge_request_without_source_project check_if_can_be_merged # Return if the response has already been rendered return if response_body respond_to do |format| format.html do # Build a note object for comment form @note = @project.notes.new(noteable: @merge_request) @noteable = @merge_request @commits_count = @merge_request.commits_count @discussions = @merge_request.discussions @notes = prepare_notes_for_rendering(@discussions.flat_map(&:notes), @noteable) labels set_pipeline_variables render end format.json do Gitlab::PollingInterval.set_header(response, interval: 10_000) render json: serializer.represent(@merge_request, serializer: params[:serializer]) end format.patch do break render_404 unless @merge_request.diff_refs send_git_patch @project.repository, @merge_request.diff_refs end format.diff do break render_404 unless @merge_request.diff_refs send_git_diff @project.repository, @merge_request.diff_refs end end end def commits # Get commits from repository # or from cache if already merged @commits = prepare_commits_for_rendering(@merge_request.commits.with_pipeline_status) render json: { html: view_to_html_string('projects/merge_requests/_commits') } end def pipelines @pipelines = @merge_request.all_pipelines Gitlab::PollingInterval.set_header(response, interval: 10_000) render json: { pipelines: PipelineSerializer .new(project: @project, current_user: @current_user) .represent(@pipelines), count: { all: @pipelines.count } } end def edit define_edit_vars 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 define_edit_vars render :edit end end 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 end rescue ActiveRecord::StaleObjectError define_edit_vars if request.format.html? render_conflict_response end def remove_wip @merge_request = ::MergeRequests::UpdateService .new(project, current_user, wip_event: 'unwip') .execute(@merge_request) render json: serialize_widget(@merge_request) end def commit_change_content render partial: 'projects/merge_requests/widget/commit_change_content', layout: false end def cancel_merge_when_pipeline_succeeds unless @merge_request.can_cancel_merge_when_pipeline_succeeds?(current_user) return access_denied! end ::MergeRequests::MergeWhenPipelineSucceedsService .new(@project, current_user) .cancel(@merge_request) render json: serialize_widget(@merge_request) end def merge return access_denied! unless @merge_request.can_be_merged_by?(current_user) status = merge! if @merge_request.merge_error render json: { status: status, merge_error: @merge_request.merge_error } else render json: { status: status } end end def assign_related_issues result = ::MergeRequests::AssignIssuesService.new(project, current_user, merge_request: @merge_request).execute 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 def pipeline_status render json: PipelineSerializer .new(project: @project, current_user: @current_user) .represent_status(@merge_request.head_pipeline) 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_sha) stop_url = if environment.stop_action? && can?(current_user, :create_deployment, environment) stop_project_environment_path(project, environment) end metrics_url = if can?(current_user, :read_environment, environment) && environment.has_metrics? metrics_project_environment_deployment_path(environment.project, environment, deployment) end metrics_monitoring_url = if can?(current_user, :read_environment, environment) environment_metrics_path(environment) end { id: environment.id, name: environment.name, url: project_environment_path(project, environment), metrics_url: metrics_url, metrics_monitoring_url: metrics_monitoring_url, 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 def rebase RebaseWorker.perform_async(@merge_request.id, current_user.id) render nothing: true, status: 200 end protected alias_method :subscribable_resource, :merge_request alias_method :issuable, :merge_request alias_method :awardable, :merge_request 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 invalid_mr # Render special view for MR with removed target branch render 'invalid' end def merge_params params.permit(merge_params_attributes) end def merge_params_attributes [:should_remove_source_branch, :commit_message] end def merge_when_pipeline_succeeds_active? params[:merge_when_pipeline_succeeds].present? && @merge_request.head_pipeline && @merge_request.head_pipeline.active? end def close_merge_request_without_source_project if !@merge_request.source_project && @merge_request.open? @merge_request.close end end private def check_if_can_be_merged @merge_request.check_if_can_be_merged end 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.actual_head_pipeline if @merge_request.actual_head_pipeline.active? ::MergeRequests::MergeWhenPipelineSucceedsService .new(@project, current_user, merge_params) .execute(@merge_request) :merge_when_pipeline_succeeds elsif @merge_request.actual_head_pipeline.success? # This can be triggered when a user clicks the auto merge button while # the tests finish at about the same time @merge_request.merge_async(current_user.id, params) :success else :failed end else @merge_request.merge_async(current_user.id, params) :success end end def serialize_widget(merge_request) serializer.represent(merge_request, serializer: 'widget') end def serializer MergeRequestSerializer.new(current_user: current_user, project: merge_request.project) end 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 def finder_type MergeRequestsFinder 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 end