merge_requests_controller.rb 20.7 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, :pipeline_status, :ci_environments_status, :toggle_subscription, :cancel_merge_when_pipeline_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]
J
James Lopez 已提交
17
  before_action :define_widget_vars, only: [:merge, :cancel_merge_when_pipeline_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
    @merge_requests     = @merge_requests.includes(merge_request_diff: :merge_request)
43
    @issuable_meta_data = issuable_meta_data(@merge_requests, @collection_type)
44

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

49 50 51 52
    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 已提交
53

C
Clement Ho 已提交
54 55 56 57 58 59 60 61 62 63 64
    @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

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

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

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

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

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

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

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

98
  def diffs
99 100
    apply_diff_view_cookie!

101
    respond_to do |format|
102
      format.html { define_discussion_vars }
103
      format.json do
104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125
        @merge_request_diff =
          if params[:diff_id]
            @merge_request.merge_request_diffs.viewable.find(params[:diff_id])
          else
            @merge_request.merge_request_diff
          end

        @merge_request_diffs = @merge_request.merge_request_diffs.viewable.select_without_diff
        @comparable_diffs = @merge_request_diffs.select { |diff| diff.id < @merge_request_diff.id }

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

          unless @start_version
            @start_sha = @merge_request_diff.head_commit_sha
            @start_version = @merge_request_diff
          end
        end

        @environment = @merge_request.environments_for(current_user).last

126 127
        if @start_sha
          compared_diff_version
128
        else
129
          original_diff_version
130
        end
131 132 133

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

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

    define_commit_vars

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

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

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

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

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

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

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

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

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

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

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

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

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

        render 'show'
      end
234 235

      format.json do
D
Douwe Maan 已提交
236 237 238
        render json: PipelineSerializer
          .new(project: @project, user: @current_user)
          .represent(@pipelines)
239
      end
240 241 242
    end
  end

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

249 250
        render json: {
          pipelines: PipelineSerializer
D
Douwe Maan 已提交
251
          .new(project: @project, user: @current_user)
F
Filipa Lacerda 已提交
252 253
          .represent(@pipelines)
        }
254 255
      end
    end
256
  end
D
Douwe Maan 已提交
257

258 259 260 261
  def new_diffs
    respond_to do |format|
      format.html do
        define_new_vars
262
        @show_changes_tab = true
263 264 265 266 267 268 269 270 271 272
        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 已提交
273
        @environment = @merge_request.environments_for(current_user).last
274 275

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

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

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

D
Douwe Maan 已提交
293 294 295 296 297 298
  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 已提交
299
  def update
300
    @merge_request = MergeRequests::UpdateService.new(project, current_user, merge_request_params).execute(@merge_request)
301

302 303 304 305 306 307
    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
          render :edit
308
        end
309
      end
310 311

      format.json do
312
        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])
313
      end
D
Dmitriy Zaporozhets 已提交
314
    end
315
  rescue ActiveRecord::StaleObjectError
316
    render_conflict_response
D
Dmitriy Zaporozhets 已提交
317 318
  end

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

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

326
  def merge_check
327
    @merge_request.check_if_can_be_merged
328
    @pipelines = @merge_request.all_pipelines
329

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

J
James Lopez 已提交
333 334
  def cancel_merge_when_pipeline_succeeds
    unless @merge_request.can_cancel_merge_when_pipeline_succeeds?(current_user)
335 336
      return access_denied!
    end
Z
Zeger-Jan van de Weg 已提交
337

D
Douwe Maan 已提交
338 339 340
    MergeRequests::MergeWhenPipelineSucceedsService
      .new(@project, current_user)
      .cancel(@merge_request)
Z
Zeger-Jan van de Weg 已提交
341 342
  end

343
  def merge
344
    return access_denied! unless @merge_request.can_be_merged_by?(current_user)
345

J
James Lopez 已提交
346
    # Disable the CI check if merge_when_pipeline_succeeds is enabled since we have
347
    # to wait until CI completes to know
J
James Lopez 已提交
348
    unless @merge_request.mergeable?(skip_ci_check: merge_when_pipeline_succeeds_active?)
Z
Zeger-Jan van de Weg 已提交
349 350 351 352
      @status = :failed
      return
    end

353
    if params[:sha] != @merge_request.diff_head_sha
354 355 356 357
      @status = :sha_mismatch
      return
    end

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

J
James Lopez 已提交
360
    if params[:merge_when_pipeline_succeeds].present?
361
      unless @merge_request.head_pipeline
362 363 364 365
        @status = :failed
        return
      end

366
      if @merge_request.head_pipeline.active?
D
Douwe Maan 已提交
367 368 369
        MergeRequests::MergeWhenPipelineSucceedsService
          .new(@project, current_user, merge_params)
          .execute(@merge_request)
370

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

386
  def merge_widget_refresh
D
Douwe Maan 已提交
387
    @status =
J
James Lopez 已提交
388 389
      if merge_request.merge_when_pipeline_succeeds
        :merge_when_pipeline_succeeds
D
Douwe Maan 已提交
390 391 392 393 394 395
      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
396 397 398 399

    render 'merge'
  end

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

    if params[:ref].present?
      @ref = params[:ref]
406
      @commit = @repository.commit("refs/heads/#{@ref}")
407 408
    end

P
Phil Hughes 已提交
409
    render layout: false
410 411 412
  end

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

    if params[:ref].present?
      @ref = params[:ref]
417
      @commit = @target_project.commit("refs/heads/#{@ref}")
418 419
    end

P
Phil Hughes 已提交
420
    render layout: false
421 422
  end

I
Izaak Alpert 已提交
423 424
  def update_branches
    @target_project = selected_target_project
I
Izaak Alpert 已提交
425
    @target_branches = @target_project.repository.branch_names
426

P
Phil Hughes 已提交
427
    render layout: false
I
Izaak Alpert 已提交
428 429
  end

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

449
  def ci_status
450
    pipeline = @merge_request.head_pipeline
451
    @pipelines = @merge_request.all_pipelines
452

453 454 455
    if pipeline
      status = pipeline.status
      coverage = pipeline.try(:coverage)
456

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

459
      status ||= "preparing"
460
    else
461
      ci_service = @merge_request.source_project.try(:ci_service)
462
      status = ci_service.commit_status(merge_request.diff_head_sha, merge_request.source_branch) if ci_service
463 464
    end

465 466
    response = {
      title: merge_request.title,
467
      sha: (merge_request.diff_head_commit.short_id if merge_request.diff_head_sha),
468
      status: status,
469
      coverage: coverage,
470 471
      pipeline: pipeline.try(:id),
      has_ci: @merge_request.has_ci?
472 473 474 475 476
    }

    render json: response
  end

477
  def pipeline_status
478 479
    render json: PipelineSerializer
      .new(project: @project, user: @current_user)
S
Shinya Maeda 已提交
480
      .represent_status(@merge_request.head_pipeline)
481 482
  end

483
  def ci_environments_status
Z
Z.J. van de Weg 已提交
484
    environments =
Z
Z.J. van de Weg 已提交
485
      begin
D
Douwe Maan 已提交
486
        @merge_request.environments_for(current_user).map do |environment|
Z
Z.J. van de Weg 已提交
487
          project = environment.project
Z
Z.J. van de Weg 已提交
488 489
          deployment = environment.first_deployment_for(@merge_request.diff_head_commit)

K
Kamil Trzcinski 已提交
490
          stop_url =
K
Kamil Trzcinski 已提交
491
            if environment.stop_action? && can?(current_user, :create_deployment, environment)
K
Kamil Trzcinski 已提交
492 493 494
              stop_namespace_project_environment_path(project.namespace, project, environment)
            end

Z
Z.J. van de Weg 已提交
495
          {
Z
Z.J. van de Weg 已提交
496
            id: environment.id,
Z
Z.J. van de Weg 已提交
497
            name: environment.name,
Z
Z.J. van de Weg 已提交
498
            url: namespace_project_environment_path(project.namespace, project, environment),
K
Kamil Trzcinski 已提交
499
            stop_url: stop_url,
Z
Z.J. van de Weg 已提交
500
            external_url: environment.external_url,
Z
Z.J. van de Weg 已提交
501 502 503
            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 已提交
504 505
          }
        end.compact
506
      end
507

Z
Z.J. van de Weg 已提交
508
    render json: environments
509 510
  end

D
Dmitriy Zaporozhets 已提交
511 512
  protected

I
Izaak Alpert 已提交
513
  def selected_target_project
514 515 516 517 518
    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 已提交
519 520
  end

D
Dmitriy Zaporozhets 已提交
521
  def merge_request
522
    @issuable = @merge_request ||= @project.merge_requests.find_by!(iid: params[:id])
D
Dmitriy Zaporozhets 已提交
523
  end
524
  alias_method :subscribable_resource, :merge_request
525
  alias_method :issuable, :merge_request
526
  alias_method :awardable, :merge_request
D
Dmitriy Zaporozhets 已提交
527

D
Dmitriy Zaporozhets 已提交
528
  def authorize_update_merge_request!
529
    return render_404 unless can?(current_user, :update_merge_request, @merge_request)
D
Dmitriy Zaporozhets 已提交
530 531 532
  end

  def authorize_admin_merge_request!
533
    return render_404 unless can?(current_user, :admin_merge_request, @merge_request)
D
Dmitriy Zaporozhets 已提交
534
  end
535

536 537 538 539
  def authorize_can_resolve_conflicts!
    return render_404 unless @merge_request.conflicts_can_be_resolved_by?(current_user)
  end

540
  def module_enabled
F
Felipe Artur 已提交
541
    return render_404 unless @project.feature_available?(:merge_requests, current_user)
542
  end
543 544

  def validates_merge_request
545 546
    # Show git not found page
    # if there is no saved commits between source & target branch
547
    if @merge_request.has_no_commits?
548 549
      # and if target branch doesn't exist
      return invalid_mr unless @merge_request.target_branch_exists?
550
    end
551 552 553
  end

  def define_show_vars
554
    @noteable = @merge_request
555
    @commits_count = @merge_request.commits_count
556 557 558 559 560

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

562
    labels
563
    define_pipelines_vars
564 565
  end

566 567 568
  # 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
569
    # Build a note object for comment form
570
    @note = @project.notes.new(noteable: @merge_request)
571

572
    @discussions = @merge_request.discussions
573
    @notes = prepare_notes_for_rendering(@discussions.flat_map(&:notes))
574 575
  end

576
  def define_widget_vars
577
    @pipeline = @merge_request.head_pipeline
578 579
  end

S
Sean McGivern 已提交
580 581 582 583 584 585
  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
586
    @new_diff_note_attrs = {
S
Sean McGivern 已提交
587 588 589 590
      noteable_type: 'MergeRequest',
      noteable_id: @merge_request.id
    }

591
    @use_legacy_diff_notes = !@merge_request.has_complete_diff_refs?
592 593 594

    @grouped_diff_discussions = @merge_request.grouped_diff_discussions
    @notes = prepare_notes_for_rendering(@grouped_diff_discussions.values.flat_map(&:notes))
S
Sean McGivern 已提交
595 596
  end

597 598
  def define_pipelines_vars
    @pipelines = @merge_request.all_pipelines
599
    @pipeline = @merge_request.head_pipeline
600
    @statuses_count = @pipeline.present? ? @pipeline.statuses.relevant.count : 0
601 602
  end

603 604 605 606 607 608 609 610 611 612 613 614 615 616 617
  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

618 619
    @note_counts = Note.where(commit_id: @commits.map(&:id)).
      group(:commit_id).count
620

621 622
    @labels = LabelsFinder.new(current_user, project_id: @project.id).execute

623 624
    @show_changes_tab = params[:show_changes].present?

625
    define_pipelines_vars
626 627
  end

628
  def invalid_mr
629
    # Render special view for MR with removed target branch
630 631 632
    render 'invalid'
  end

633
  def merge_request_params
D
Douwe Maan 已提交
634 635
    params.require(:merge_request)
      .permit(merge_request_params_ce)
636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654
  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: []
    ]
655
  end
656

Z
Zeger-Jan van de Weg 已提交
657 658 659 660
  def merge_params
    params.permit(:should_remove_source_branch, :commit_message)
  end

661 662 663 664 665
  # 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
666

J
James Lopez 已提交
667 668
  def merge_when_pipeline_succeeds_active?
    params[:merge_when_pipeline_succeeds].present? &&
669
      @merge_request.head_pipeline && @merge_request.head_pipeline.active?
670
  end
S
Sean McGivern 已提交
671 672 673

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

677
  def compared_diff_version
678 679
    @diff_notes_disabled = true
    @diffs = @merge_request_diff.compare_with(@start_sha).diffs(diff_options)
680
  end
681 682

  def original_diff_version
683
    @diff_notes_disabled = !@merge_request_diff.latest?
684 685
    @diffs = @merge_request_diff.diffs(diff_options)
  end
686 687 688 689 690 691

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