merge_requests_controller.rb 20.5 KB
Newer Older
1
class Projects::MergeRequestsController < Projects::ApplicationController
2
  include ToggleSubscriptionAction
S
Sean McGivern 已提交
3
  include DiffForPath
J
Jacob Vosmaer 已提交
4
  include DiffHelper
5
  include IssuableActions
6
  include NotesHelper
7
  include ToggleAwardEmoji
8
  include IssuableCollections
J
Jacob Vosmaer 已提交
9

10
  before_action :module_enabled
11
  before_action :merge_request, only: [
12
    :edit, :update, :show, :diffs, :commits, :conflicts, :conflict_for_path, :pipelines, :merge, :merge_check,
13
    :ci_status, :ci_environments_status, :toggle_subscription, :cancel_merge_when_build_succeeds, :remove_wip, :resolve_conflicts, :assign_related_issues
14
  ]
15
  before_action :validates_merge_request, only: [:show, :diffs, :commits, :pipelines]
16
  before_action :define_show_vars, only: [:show, :diffs, :commits, :conflicts, :conflict_for_path, :builds, :pipelines]
17
  before_action :define_widget_vars, only: [:merge, :cancel_merge_when_build_succeeds, :merge_check]
S
Sean McGivern 已提交
18 19
  before_action :define_commit_vars, only: [:diffs]
  before_action :define_diff_comment_vars, only: [:diffs]
20
  before_action :ensure_ref_fetched, only: [:show, :diffs, :commits, :builds, :conflicts, :conflict_for_path, :pipelines]
K
Katarzyna Kobierska 已提交
21
  before_action :close_merge_request_without_source_project, only: [:show, :diffs, :commits, :builds, :pipelines]
22 23
  before_action :apply_diff_view_cookie!, only: [:new_diffs]
  before_action :build_merge_request, only: [:new, :new_diffs]
D
Dmitriy Zaporozhets 已提交
24 25

  # Allow read any merge_request
26
  before_action :authorize_read_merge_request!
D
Dmitriy Zaporozhets 已提交
27 28

  # Allow write(create) merge_request
D
Dmitriy Zaporozhets 已提交
29
  before_action :authorize_create_merge_request!, only: [:new, :create]
D
Dmitriy Zaporozhets 已提交
30 31

  # Allow modify merge_request
32
  before_action :authorize_update_merge_request!, only: [:close, :edit, :update, :remove_wip, :sort]
D
Dmitriy Zaporozhets 已提交
33

34 35
  before_action :authenticate_user!, only: [:assign_related_issues]

36
  before_action :authorize_can_resolve_conflicts!, only: [:conflicts, :conflict_for_path, :resolve_conflicts]
37

D
Dmitriy Zaporozhets 已提交
38
  def index
39 40 41
    @collection_type    = "MergeRequest"
    @merge_requests     = merge_requests_collection
    @merge_requests     = @merge_requests.page(params[:page])
42
    @issuable_meta_data = issuable_meta_data(@merge_requests, @collection_type)
43

44
    if @merge_requests.out_of_range? && @merge_requests.total_pages != 0
45
      return redirect_to url_for(params.merge(page: @merge_requests.total_pages))
46
    end
47

48 49 50 51
    if params[:label_name].present?
      labels_params = { project_id: @project.id, title: params[:label_name] }
      @labels = LabelsFinder.new(current_user, labels_params).execute
    end
T
Tap 已提交
52

C
Clement Ho 已提交
53 54 55 56 57 58 59 60 61 62 63
    @users = []
    if params[:assignee_id].present?
      assignee = User.find_by_id(params[:assignee_id])
      @users.push(assignee) if assignee
    end

    if params[:author_id].present?
      author = User.find_by_id(params[:author_id])
      @users.push(author) if author
    end

64 65 66 67
    respond_to do |format|
      format.html
      format.json do
        render json: {
68
          html: view_to_html_string("projects/merge_requests/_merge_requests"),
P
Phil Hughes 已提交
69
          labels: @labels.as_json(methods: :text_color)
70 71 72
        }
      end
    end
D
Dmitriy Zaporozhets 已提交
73 74 75
  end

  def show
76
    respond_to do |format|
77
      format.html { define_discussion_vars }
S
Sean McGivern 已提交
78

D
Douwe Maan 已提交
79
      format.json do
80
        render json: MergeRequestSerializer.new.represent(@merge_request)
D
Douwe Maan 已提交
81 82
      end

Z
Z.J. van de Weg 已提交
83
      format.patch  do
D
Douwe Maan 已提交
84 85 86
        return render_404 unless @merge_request.diff_refs

        send_git_patch @project.repository, @merge_request.diff_refs
Z
Z.J. van de Weg 已提交
87
      end
D
Douwe Maan 已提交
88

89
      format.diff do
D
Douwe Maan 已提交
90
        return render_404 unless @merge_request.diff_refs
91

D
Douwe Maan 已提交
92
        send_git_diff @project.repository, @merge_request.diff_refs
93
      end
94
    end
R
randx 已提交
95 96
  end

97
  def diffs
98 99
    apply_diff_view_cookie!

100 101
    @merge_request_diff =
      if params[:diff_id]
102
        @merge_request.merge_request_diffs.viewable.find(params[:diff_id])
103 104 105
      else
        @merge_request.merge_request_diff
      end
106

107
    @merge_request_diffs = @merge_request.merge_request_diffs.viewable.select_without_diff
108 109 110 111
    @comparable_diffs = @merge_request_diffs.select { |diff| diff.id < @merge_request_diff.id }

    if params[:start_sha].present?
      @start_sha = params[:start_sha]
112 113 114
      @start_version = @comparable_diffs.find { |diff| diff.head_commit_sha == @start_sha }

      unless @start_version
115 116
        @start_sha = @merge_request_diff.head_commit_sha
        @start_version = @merge_request_diff
117
      end
118 119
    end

D
Douwe Maan 已提交
120
    @environment = @merge_request.environments_for(current_user).last
121

122
    respond_to do |format|
123
      format.html { define_discussion_vars }
124
      format.json do
125 126
        if @start_sha
          compared_diff_version
127
        else
128
          original_diff_version
129
        end
130 131 132

        render json: { html: view_to_html_string("projects/merge_requests/show/_diffs") }
      end
133
    end
D
Dmitriy Zaporozhets 已提交
134 135
  end

S
Sean McGivern 已提交
136 137 138 139 140 141 142 143 144 145
  # 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
146
      @grouped_diff_discussions = {}
S
Sean McGivern 已提交
147 148 149 150
    end

    define_commit_vars

151
    render_diff_for_path(@merge_request.diffs(diff_options))
S
Sean McGivern 已提交
152 153
  end

154
  def commits
155
    respond_to do |format|
156 157 158 159 160
      format.html do
        define_discussion_vars

        render 'show'
      end
161 162 163 164
      format.json do
        # Get commits from repository
        # or from cache if already merged
        @commits = @merge_request.commits
165 166
        @note_counts = Note.where(commit_id: @commits.map(&:id)).
          group(:commit_id).count
167 168 169

        render json: { html: view_to_html_string('projects/merge_requests/show/_commits') }
      end
170
    end
171 172
  end

173 174
  def conflicts
    respond_to do |format|
175
      format.html { define_discussion_vars }
S
Sean McGivern 已提交
176

177
      format.json do
178
        if @merge_request.conflicts_can_be_resolved_in_ui?
179
          render json: @merge_request.conflicts
180 181 182 183 184
        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'
          }
185
        else
186
          render json: {
187
            message: 'The merge conflicts for this merge request cannot be resolved through GitLab. Please try to resolve them locally.',
188 189
            type: 'error'
          }
190 191
        end
      end
192 193 194
    end
  end

195 196 197 198 199 200 201 202 203 204
  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

205
  def resolve_conflicts
206 207 208 209 210 211 212
    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

213
    begin
214
      MergeRequests::ResolveService.new(@merge_request.source_project, current_user, params).execute(@merge_request)
215

216
      flash[:notice] = 'All merge conflicts were resolved. The merge request can now be merged.'
217

218
      render json: { redirect_to: namespace_project_merge_request_url(@project.namespace, @project, @merge_request, resolved_conflicts: true) }
219
    rescue Gitlab::Conflict::ResolutionError => e
220 221
      render status: :bad_request, json: { message: e.message }
    end
222 223
  end

224
  def pipelines
225
    @pipelines = @merge_request.all_pipelines
226

227 228 229 230 231 232
    respond_to do |format|
      format.html do
        define_discussion_vars

        render 'show'
      end
233 234

      format.json do
235 236 237
        render json: PipelineSerializer.
          new(project: @project, user: @current_user).
          represent(@pipelines)
238
      end
239 240 241
    end
  end

D
Dmitriy Zaporozhets 已提交
242
  def new
243 244 245
    respond_to do |format|
      format.html { define_new_vars }
      format.json do
246 247
        define_pipelines_vars

248 249 250
        render json: PipelineSerializer.
          new(project: @project, user: @current_user).
          represent(@pipelines)
251 252
      end
    end
253
  end
D
Douwe Maan 已提交
254

255 256 257 258
  def new_diffs
    respond_to do |format|
      format.html do
        define_new_vars
259
        @show_changes_tab = true
260 261 262 263 264 265 266 267 268 269
        render "new"
      end
      format.json do
        @diffs = if @merge_request.can_be_created
                   @merge_request.diffs(diff_options)
                 else
                   []
                 end
        @diff_notes_disabled = true

D
Douwe Maan 已提交
270
        @environment = @merge_request.environments_for(current_user).last
271 272

        render json: { html: view_to_html_string('projects/merge_requests/_new_diffs', diffs: @diffs, environment: @environment) }
273 274
      end
    end
D
Dmitriy Zaporozhets 已提交
275 276 277
  end

  def create
I
Izaak Alpert 已提交
278
    @target_branches ||= []
279
    @merge_request = MergeRequests::CreateService.new(project, current_user, merge_request_params).execute
280 281

    if @merge_request.valid?
282
      redirect_to(merge_request_path(@merge_request))
283
    else
I
Izaak Alpert 已提交
284 285 286
      @source_project = @merge_request.source_project
      @target_project = @merge_request.target_project
      render action: "new"
D
Dmitriy Zaporozhets 已提交
287 288 289
    end
  end

D
Douwe Maan 已提交
290 291 292 293 294 295
  def edit
    @source_project = @merge_request.source_project
    @target_project = @merge_request.target_project
    @target_branches = @merge_request.target_project.repository.branch_names
  end

D
Dmitriy Zaporozhets 已提交
296
  def update
297
    @merge_request = MergeRequests::UpdateService.new(project, current_user, merge_request_params).execute(@merge_request)
298

299
    if @merge_request.valid?
300 301
      respond_to do |format|
        format.html do
V
Vinnie Okada 已提交
302
          redirect_to([@merge_request.target_project.namespace.becomes(Namespace),
303
                       @merge_request.target_project, @merge_request])
304
        end
305
        format.json do
306
          render json: @merge_request.to_json(include: { milestone: {}, assignee: { methods: :avatar_url }, labels: { methods: :text_color } }, methods: [:task_status, :task_status_short])
307
        end
308
      end
309
    else
310
      render "edit"
D
Dmitriy Zaporozhets 已提交
311
    end
312 313 314
  rescue ActiveRecord::StaleObjectError
    @conflict = true
    render :edit
D
Dmitriy Zaporozhets 已提交
315 316
  end

317
  def remove_wip
T
Thomas Balthazar 已提交
318
    MergeRequests::UpdateService.new(project, current_user, wip_event: 'unwip').execute(@merge_request)
319 320 321 322 323

    redirect_to namespace_project_merge_request_path(@project.namespace, @project, @merge_request),
      notice: "The merge request can now be merged."
  end

324
  def merge_check
325
    @merge_request.check_if_can_be_merged
326

D
Dmitriy Zaporozhets 已提交
327
    render partial: "projects/merge_requests/widget/show.html.haml", layout: false
V
Valery Sizov 已提交
328 329
  end

Z
Zeger-Jan van de Weg 已提交
330
  def cancel_merge_when_build_succeeds
331 332 333
    unless @merge_request.can_cancel_merge_when_build_succeeds?(current_user)
      return access_denied!
    end
Z
Zeger-Jan van de Weg 已提交
334

335 336 337
    MergeRequests::MergeWhenPipelineSucceedsService.
      new(@project, current_user).
      cancel(@merge_request)
Z
Zeger-Jan van de Weg 已提交
338 339
  end

340
  def merge
341
    return access_denied! unless @merge_request.can_be_merged_by?(current_user)
342

343 344 345
    # 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?)
Z
Zeger-Jan van de Weg 已提交
346 347 348 349
      @status = :failed
      return
    end

350
    if params[:sha] != @merge_request.diff_head_sha
351 352 353 354
      @status = :sha_mismatch
      return
    end

Z
Zeger-Jan van de Weg 已提交
355 356
    @merge_request.update(merge_error: nil)

357
    if params[:merge_when_build_succeeds].present?
358
      unless @merge_request.head_pipeline
359 360 361 362
        @status = :failed
        return
      end

363
      if @merge_request.head_pipeline.active?
364 365 366
        MergeRequests::MergeWhenPipelineSucceedsService.
          new(@project, current_user, merge_params).
          execute(@merge_request)
367

368
        @status = :merge_when_build_succeeds
369
      elsif @merge_request.head_pipeline.success?
Z
Z.J. van de Weg 已提交
370 371
        # This can be triggered when a user clicks the auto merge button while
        # the tests finish at about the same time
372 373 374 375 376
        MergeWorker.perform_async(@merge_request.id, current_user.id, params)
        @status = :success
      else
        @status = :failed
      end
377
    else
Z
Zeger-Jan van de Weg 已提交
378 379
      MergeWorker.perform_async(@merge_request.id, current_user.id, params)
      @status = :success
380
    end
R
randx 已提交
381 382
  end

383
  def merge_widget_refresh
D
Douwe Maan 已提交
384 385 386 387 388 389 390 391 392
    @status =
      if merge_request.merge_when_build_succeeds
        :merge_when_build_succeeds
      else
        # Only MRs that can be merged end in this action
        # MR can be already picked up for merge / merged already or can be waiting for worker to be picked up
        # in last case it does not have any special status. Possible error is handled inside widget js function
        :success
      end
393 394 395 396

    render 'merge'
  end

397
  def branch_from
F
Felipe Artur 已提交
398
    # This is always source
I
Izaak Alpert 已提交
399
    @source_project = @merge_request.nil? ? @project : @merge_request.source_project
400 401 402 403 404 405

    if params[:ref].present?
      @ref = params[:ref]
      @commit = @repository.commit(@ref)
    end

P
Phil Hughes 已提交
406
    render layout: false
407 408 409
  end

  def branch_to
I
Izaak Alpert 已提交
410
    @target_project = selected_target_project
411 412 413 414 415 416

    if params[:ref].present?
      @ref = params[:ref]
      @commit = @target_project.commit(@ref)
    end

P
Phil Hughes 已提交
417
    render layout: false
418 419
  end

I
Izaak Alpert 已提交
420 421
  def update_branches
    @target_project = selected_target_project
I
Izaak Alpert 已提交
422
    @target_branches = @target_project.repository.branch_names
423

P
Phil Hughes 已提交
424
    render layout: false
I
Izaak Alpert 已提交
425 426
  end

427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445
  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

446
  def ci_status
447 448
    pipeline = @merge_request.head_pipeline

449 450 451
    if pipeline
      status = pipeline.status
      coverage = pipeline.try(:coverage)
452

C
Connor Shea 已提交
453
      status = "success_with_warnings" if pipeline.success? && pipeline.has_warnings?
454

455
      status ||= "preparing"
456
    else
457
      ci_service = @merge_request.source_project.try(:ci_service)
458
      status = ci_service.commit_status(merge_request.diff_head_sha, merge_request.source_branch) if ci_service
459 460
    end

461 462
    response = {
      title: merge_request.title,
463
      sha: (merge_request.diff_head_commit.short_id if merge_request.diff_head_sha),
464
      status: status,
465 466
      coverage: coverage,
      pipeline: pipeline.try(:id)
467 468 469 470 471 472
    }

    render json: response
  end

  def ci_environments_status
Z
Z.J. van de Weg 已提交
473
    environments =
Z
Z.J. van de Weg 已提交
474
      begin
D
Douwe Maan 已提交
475
        @merge_request.environments_for(current_user).map do |environment|
Z
Z.J. van de Weg 已提交
476
          project = environment.project
Z
Z.J. van de Weg 已提交
477 478
          deployment = environment.first_deployment_for(@merge_request.diff_head_commit)

K
Kamil Trzcinski 已提交
479
          stop_url =
K
Kamil Trzcinski 已提交
480
            if environment.stop_action? && can?(current_user, :create_deployment, environment)
K
Kamil Trzcinski 已提交
481 482 483
              stop_namespace_project_environment_path(project.namespace, project, environment)
            end

Z
Z.J. van de Weg 已提交
484
          {
Z
Z.J. van de Weg 已提交
485
            id: environment.id,
Z
Z.J. van de Weg 已提交
486
            name: environment.name,
Z
Z.J. van de Weg 已提交
487
            url: namespace_project_environment_path(project.namespace, project, environment),
K
Kamil Trzcinski 已提交
488
            stop_url: stop_url,
Z
Z.J. van de Weg 已提交
489
            external_url: environment.external_url,
Z
Z.J. van de Weg 已提交
490 491 492
            external_url_formatted: environment.formatted_external_url,
            deployed_at: deployment.try(:created_at),
            deployed_at_formatted: deployment.try(:formatted_deployment_time)
Z
Z.J. van de Weg 已提交
493 494
          }
        end.compact
495
      end
496

Z
Z.J. van de Weg 已提交
497
    render json: environments
498 499
  end

D
Dmitriy Zaporozhets 已提交
500 501
  protected

I
Izaak Alpert 已提交
502
  def selected_target_project
503 504 505 506 507
    if @project.id.to_s == params[:target_project_id] || @project.forked_project_link.nil?
      @project
    else
      @project.forked_project_link.forked_from_project
    end
I
Izaak Alpert 已提交
508 509
  end

D
Dmitriy Zaporozhets 已提交
510
  def merge_request
511
    @issuable = @merge_request ||= @project.merge_requests.find_by!(iid: params[:id])
D
Dmitriy Zaporozhets 已提交
512
  end
513
  alias_method :subscribable_resource, :merge_request
514
  alias_method :issuable, :merge_request
515
  alias_method :awardable, :merge_request
D
Dmitriy Zaporozhets 已提交
516

D
Dmitriy Zaporozhets 已提交
517
  def authorize_update_merge_request!
518
    return render_404 unless can?(current_user, :update_merge_request, @merge_request)
D
Dmitriy Zaporozhets 已提交
519 520 521
  end

  def authorize_admin_merge_request!
522
    return render_404 unless can?(current_user, :admin_merge_request, @merge_request)
D
Dmitriy Zaporozhets 已提交
523
  end
524

525 526 527 528
  def authorize_can_resolve_conflicts!
    return render_404 unless @merge_request.conflicts_can_be_resolved_by?(current_user)
  end

529
  def module_enabled
F
Felipe Artur 已提交
530
    return render_404 unless @project.feature_available?(:merge_requests, current_user)
531
  end
532 533

  def validates_merge_request
534 535
    # Show git not found page
    # if there is no saved commits between source & target branch
536
    if @merge_request.has_no_commits?
537 538
      # and if target branch doesn't exist
      return invalid_mr unless @merge_request.target_branch_exists?
539
    end
540 541 542
  end

  def define_show_vars
543
    @noteable = @merge_request
544
    @commits_count = @merge_request.commits_count
545 546 547 548 549

    if @merge_request.locked_long_ago?
      @merge_request.unlock_mr
      @merge_request.close
    end
550

551
    labels
552
    define_pipelines_vars
553 554
  end

555 556 557
  # 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
558
    # Build a note object for comment form
559
    @note = @project.notes.new(noteable: @merge_request)
560

561
    @discussions = @merge_request.discussions
562

563 564
    preload_noteable_for_regular_notes(@discussions.flat_map(&:notes))

565
    # This is not executed lazily
566
    @notes = Banzai::NoteRenderer.render(
567
      @discussions.flat_map(&:notes),
568 569 570 571 572 573
      @project,
      current_user,
      @path,
      @project_wiki,
      @ref
    )
574

S
Stan Hu 已提交
575
    preload_max_access_for_authors(@notes, @project)
576 577
  end

578
  def define_widget_vars
579
    @pipeline = @merge_request.head_pipeline
580 581
  end

S
Sean McGivern 已提交
582 583 584 585 586 587 588 589 590 591 592
  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
    }

593
    @use_legacy_diff_notes = !@merge_request.has_complete_diff_refs?
D
Douwe Maan 已提交
594
    @grouped_diff_discussions = @merge_request.notes.inc_relations_for_view.grouped_diff_discussions
S
Sean McGivern 已提交
595 596

    Banzai::NoteRenderer.render(
597
      @grouped_diff_discussions.values.flat_map(&:notes),
S
Sean McGivern 已提交
598 599 600 601 602 603 604 605
      @project,
      current_user,
      @path,
      @project_wiki,
      @ref
    )
  end

606 607
  def define_pipelines_vars
    @pipelines = @merge_request.all_pipelines
608
    @pipeline = @merge_request.head_pipeline
609
    @statuses_count = @pipeline.present? ? @pipeline.statuses.relevant.count : 0
610 611
  end

612 613 614 615 616 617 618 619 620 621 622 623 624 625 626
  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

627 628
    @note_counts = Note.where(commit_id: @commits.map(&:id)).
      group(:commit_id).count
629

630 631
    @labels = LabelsFinder.new(current_user, project_id: @project.id).execute

632 633
    @show_changes_tab = params[:show_changes].present?

634
    define_pipelines_vars
635 636
  end

637
  def invalid_mr
638
    # Render special view for MR with removed target branch
639 640 641
    render 'invalid'
  end

642
  def merge_request_params
643 644
    params.require(:merge_request).
      permit(merge_request_params_ce)
645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663
  end

  def merge_request_params_ce
    [
      :assignee_id,
      :description,
      :force_remove_source_branch,
      :lock_version,
      :milestone_id,
      :source_branch,
      :source_project_id,
      :state_event,
      :target_branch,
      :target_project_id,
      :task_num,
      :title,

      label_ids: []
    ]
664
  end
665

Z
Zeger-Jan van de Weg 已提交
666 667 668 669
  def merge_params
    params.permit(:should_remove_source_branch, :commit_message)
  end

670 671 672 673 674
  # 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
675 676 677

  def merge_when_build_succeeds_active?
    params[:merge_when_build_succeeds].present? &&
678
      @merge_request.head_pipeline && @merge_request.head_pipeline.active?
679
  end
S
Sean McGivern 已提交
680 681 682

  def build_merge_request
    params[:merge_request] ||= ActionController::Parameters.new(source_project: @project)
683
    @merge_request = MergeRequests::BuildService.new(project, current_user, merge_request_params.merge(diff_options: diff_options)).execute
S
Sean McGivern 已提交
684
  end
685

686
  def compared_diff_version
687 688
    @diff_notes_disabled = true
    @diffs = @merge_request_diff.compare_with(@start_sha).diffs(diff_options)
689
  end
690 691

  def original_diff_version
692
    @diff_notes_disabled = !@merge_request_diff.latest?
693 694
    @diffs = @merge_request_diff.diffs(diff_options)
  end
695 696 697 698 699 700

  def close_merge_request_without_source_project
    if !@merge_request.source_project && @merge_request.open?
      @merge_request.close
    end
  end
D
Dmitriy Zaporozhets 已提交
701
end