merge_requests_controller.rb 20.8 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
D
Douwe Maan 已提交
6
  include RendersNotes
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
  before_action :define_commit_vars, only: [:diffs]
19
  before_action :ensure_ref_fetched, only: [:show, :diffs, :commits, :builds, :conflicts, :conflict_for_path, :pipelines]
K
Katarzyna Kobierska 已提交
20
  before_action :close_merge_request_without_source_project, only: [:show, :diffs, :commits, :builds, :pipelines]
21 22
  before_action :apply_diff_view_cookie!, only: [:new_diffs]
  before_action :build_merge_request, only: [:new, :new_diffs]
D
Dmitriy Zaporozhets 已提交
23 24

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

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

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

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

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

D
Dmitriy Zaporozhets 已提交
37
  def index
38 39 40
    @collection_type    = "MergeRequest"
    @merge_requests     = merge_requests_collection
    @merge_requests     = @merge_requests.page(params[:page])
41
    @merge_requests     = @merge_requests.includes(merge_request_diff: :merge_request)
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, only_path: true))
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
    respond_to do |format|
101
      format.html { define_discussion_vars }
102
      format.json do
D
Douwe Maan 已提交
103
        define_diff_vars
104 105
        define_diff_comment_vars

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

108 109
        render json: { html: view_to_html_string("projects/merge_requests/show/_diffs") }
      end
110
    end
D
Dmitriy Zaporozhets 已提交
111 112
  end

S
Sean McGivern 已提交
113 114 115 116 117 118
  # 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
D
Douwe Maan 已提交
119
      define_diff_vars
S
Sean McGivern 已提交
120 121 122
      define_diff_comment_vars
    else
      build_merge_request
D
Douwe Maan 已提交
123
      @diffs = @merge_request.diffs(diff_options)
S
Sean McGivern 已提交
124 125 126 127 128
      @diff_notes_disabled = true
    end

    define_commit_vars

D
Douwe Maan 已提交
129
    render_diff_for_path(@diffs)
S
Sean McGivern 已提交
130 131
  end

132
  def commits
133
    respond_to do |format|
134 135 136 137 138
      format.html do
        define_discussion_vars

        render 'show'
      end
139 140 141 142
      format.json do
        # Get commits from repository
        # or from cache if already merged
        @commits = @merge_request.commits
143 144
        @note_counts = Note.where(commit_id: @commits.map(&:id)).
          group(:commit_id).count
145 146 147

        render json: { html: view_to_html_string('projects/merge_requests/show/_commits') }
      end
148
    end
149 150
  end

151 152
  def conflicts
    respond_to do |format|
153
      format.html { define_discussion_vars }
S
Sean McGivern 已提交
154

155
      format.json do
156
        if @merge_request.conflicts_can_be_resolved_in_ui?
157
          render json: @merge_request.conflicts
158 159 160 161 162
        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'
          }
163
        else
164
          render json: {
165
            message: 'The merge conflicts for this merge request cannot be resolved through GitLab. Please try to resolve them locally.',
166 167
            type: 'error'
          }
168 169
        end
      end
170 171 172
    end
  end

173 174 175 176 177 178 179 180 181 182
  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

183
  def resolve_conflicts
184 185 186 187 188 189 190
    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

191
    begin
192
      MergeRequests::ResolveService.new(@merge_request.source_project, current_user, params).execute(@merge_request)
193

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

196
      render json: { redirect_to: namespace_project_merge_request_url(@project.namespace, @project, @merge_request, resolved_conflicts: true) }
197
    rescue Gitlab::Conflict::ResolutionError => e
198 199
      render status: :bad_request, json: { message: e.message }
    end
200 201
  end

202
  def pipelines
203
    @pipelines = @merge_request.all_pipelines
204

205 206 207 208 209 210
    respond_to do |format|
      format.html do
        define_discussion_vars

        render 'show'
      end
211 212

      format.json do
213 214
        Gitlab::PollingInterval.set_header(response, interval: 10_000)

D
Douwe Maan 已提交
215 216 217
        render json: PipelineSerializer
          .new(project: @project, user: @current_user)
          .represent(@pipelines)
218
      end
219 220 221
    end
  end

D
Dmitriy Zaporozhets 已提交
222
  def new
223 224 225
    respond_to do |format|
      format.html { define_new_vars }
      format.json do
226 227
        define_pipelines_vars

228 229
        Gitlab::PollingInterval.set_header(response, interval: 10_000)

230 231
        render json: {
          pipelines: PipelineSerializer
D
Douwe Maan 已提交
232
          .new(project: @project, user: @current_user)
F
Filipa Lacerda 已提交
233 234
          .represent(@pipelines)
        }
235 236
      end
    end
237
  end
D
Douwe Maan 已提交
238

239 240 241 242
  def new_diffs
    respond_to do |format|
      format.html do
        define_new_vars
243
        @show_changes_tab = true
244 245 246 247 248 249 250 251 252 253
        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 已提交
254
        @environment = @merge_request.environments_for(current_user).last
255 256

        render json: { html: view_to_html_string('projects/merge_requests/_new_diffs', diffs: @diffs, environment: @environment) }
257 258
      end
    end
D
Dmitriy Zaporozhets 已提交
259 260 261
  end

  def create
I
Izaak Alpert 已提交
262
    @target_branches ||= []
263
    @merge_request = MergeRequests::CreateService.new(project, current_user, merge_request_params).execute
264 265

    if @merge_request.valid?
266
      redirect_to(merge_request_path(@merge_request))
267
    else
I
Izaak Alpert 已提交
268 269 270
      @source_project = @merge_request.source_project
      @target_project = @merge_request.target_project
      render action: "new"
D
Dmitriy Zaporozhets 已提交
271 272 273
    end
  end

D
Douwe Maan 已提交
274 275 276 277 278 279
  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 已提交
280
  def update
281
    @merge_request = MergeRequests::UpdateService.new(project, current_user, merge_request_params).execute(@merge_request)
282

283 284 285 286 287 288
    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
289
        end
290
      end
291 292

      format.json do
293
        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])
294
      end
D
Dmitriy Zaporozhets 已提交
295
    end
296
  rescue ActiveRecord::StaleObjectError
297
    render_conflict_response
D
Dmitriy Zaporozhets 已提交
298 299
  end

300
  def remove_wip
T
Thomas Balthazar 已提交
301
    MergeRequests::UpdateService.new(project, current_user, wip_event: 'unwip').execute(@merge_request)
302 303 304 305 306

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

307
  def merge_check
308
    @merge_request.check_if_can_be_merged
309
    @pipelines = @merge_request.all_pipelines
310

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

J
James Lopez 已提交
314 315
  def cancel_merge_when_pipeline_succeeds
    unless @merge_request.can_cancel_merge_when_pipeline_succeeds?(current_user)
316 317
      return access_denied!
    end
Z
Zeger-Jan van de Weg 已提交
318

D
Douwe Maan 已提交
319 320 321
    MergeRequests::MergeWhenPipelineSucceedsService
      .new(@project, current_user)
      .cancel(@merge_request)
Z
Zeger-Jan van de Weg 已提交
322 323
  end

324
  def merge
325
    return access_denied! unless @merge_request.can_be_merged_by?(current_user)
326

J
James Lopez 已提交
327
    # Disable the CI check if merge_when_pipeline_succeeds is enabled since we have
328
    # to wait until CI completes to know
J
James Lopez 已提交
329
    unless @merge_request.mergeable?(skip_ci_check: merge_when_pipeline_succeeds_active?)
Z
Zeger-Jan van de Weg 已提交
330 331 332 333
      @status = :failed
      return
    end

334
    if params[:sha] != @merge_request.diff_head_sha
335 336 337 338
      @status = :sha_mismatch
      return
    end

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

J
James Lopez 已提交
341
    if params[:merge_when_pipeline_succeeds].present?
342
      unless @merge_request.head_pipeline
343 344 345 346
        @status = :failed
        return
      end

347
      if @merge_request.head_pipeline.active?
D
Douwe Maan 已提交
348 349 350
        MergeRequests::MergeWhenPipelineSucceedsService
          .new(@project, current_user, merge_params)
          .execute(@merge_request)
351

J
James Lopez 已提交
352
        @status = :merge_when_pipeline_succeeds
353
      elsif @merge_request.head_pipeline.success?
Z
Z.J. van de Weg 已提交
354 355
        # This can be triggered when a user clicks the auto merge button while
        # the tests finish at about the same time
356 357 358 359 360
        MergeWorker.perform_async(@merge_request.id, current_user.id, params)
        @status = :success
      else
        @status = :failed
      end
361
    else
Z
Zeger-Jan van de Weg 已提交
362 363
      MergeWorker.perform_async(@merge_request.id, current_user.id, params)
      @status = :success
364
    end
R
randx 已提交
365 366
  end

367
  def merge_widget_refresh
D
Douwe Maan 已提交
368
    @status =
J
James Lopez 已提交
369 370
      if merge_request.merge_when_pipeline_succeeds
        :merge_when_pipeline_succeeds
D
Douwe Maan 已提交
371 372 373 374 375 376
      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
377 378 379 380

    render 'merge'
  end

381
  def branch_from
F
Felipe Artur 已提交
382
    # This is always source
I
Izaak Alpert 已提交
383
    @source_project = @merge_request.nil? ? @project : @merge_request.source_project
384 385 386

    if params[:ref].present?
      @ref = params[:ref]
387
      @commit = @repository.commit("refs/heads/#{@ref}")
388 389
    end

P
Phil Hughes 已提交
390
    render layout: false
391 392 393
  end

  def branch_to
I
Izaak Alpert 已提交
394
    @target_project = selected_target_project
395 396 397

    if params[:ref].present?
      @ref = params[:ref]
398
      @commit = @target_project.commit("refs/heads/#{@ref}")
399 400
    end

P
Phil Hughes 已提交
401
    render layout: false
402 403
  end

I
Izaak Alpert 已提交
404 405
  def update_branches
    @target_project = selected_target_project
I
Izaak Alpert 已提交
406
    @target_branches = @target_project.repository.branch_names
407

P
Phil Hughes 已提交
408
    render layout: false
I
Izaak Alpert 已提交
409 410
  end

411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429
  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

430
  def ci_status
431
    pipeline = @merge_request.head_pipeline
432
    @pipelines = @merge_request.all_pipelines
433

434 435
    if pipeline
      status = pipeline.status
436
      coverage = pipeline.coverage
437

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

440
      status ||= "preparing"
441
    else
442
      ci_service = @merge_request.source_project.try(:ci_service)
443
      status = ci_service.commit_status(merge_request.diff_head_sha, merge_request.source_branch) if ci_service
444 445
    end

446 447
    response = {
      title: merge_request.title,
448
      sha: (merge_request.diff_head_commit.short_id if merge_request.diff_head_sha),
449
      status: status,
450
      coverage: coverage,
451 452
      pipeline: pipeline.try(:id),
      has_ci: @merge_request.has_ci?
453 454 455 456 457
    }

    render json: response
  end

458
  def pipeline_status
459 460
    render json: PipelineSerializer
      .new(project: @project, user: @current_user)
S
Shinya Maeda 已提交
461
      .represent_status(@merge_request.head_pipeline)
462 463
  end

464
  def ci_environments_status
Z
Z.J. van de Weg 已提交
465
    environments =
Z
Z.J. van de Weg 已提交
466
      begin
D
Douwe Maan 已提交
467
        @merge_request.environments_for(current_user).map do |environment|
Z
Z.J. van de Weg 已提交
468
          project = environment.project
Z
Z.J. van de Weg 已提交
469 470
          deployment = environment.first_deployment_for(@merge_request.diff_head_commit)

K
Kamil Trzcinski 已提交
471
          stop_url =
K
Kamil Trzcinski 已提交
472
            if environment.stop_action? && can?(current_user, :create_deployment, environment)
K
Kamil Trzcinski 已提交
473 474 475
              stop_namespace_project_environment_path(project.namespace, project, environment)
            end

Z
Z.J. van de Weg 已提交
476
          {
Z
Z.J. van de Weg 已提交
477
            id: environment.id,
Z
Z.J. van de Weg 已提交
478
            name: environment.name,
Z
Z.J. van de Weg 已提交
479
            url: namespace_project_environment_path(project.namespace, project, environment),
K
Kamil Trzcinski 已提交
480
            stop_url: stop_url,
Z
Z.J. van de Weg 已提交
481
            external_url: environment.external_url,
Z
Z.J. van de Weg 已提交
482 483 484
            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 已提交
485 486
          }
        end.compact
487
      end
488

Z
Z.J. van de Weg 已提交
489
    render json: environments
490 491
  end

D
Dmitriy Zaporozhets 已提交
492 493
  protected

I
Izaak Alpert 已提交
494
  def selected_target_project
495 496 497 498 499
    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 已提交
500 501
  end

D
Dmitriy Zaporozhets 已提交
502
  def merge_request
503
    @issuable = @merge_request ||= @project.merge_requests.find_by!(iid: params[:id])
D
Dmitriy Zaporozhets 已提交
504
  end
505
  alias_method :subscribable_resource, :merge_request
506
  alias_method :issuable, :merge_request
507
  alias_method :awardable, :merge_request
D
Dmitriy Zaporozhets 已提交
508

D
Dmitriy Zaporozhets 已提交
509
  def authorize_update_merge_request!
510
    return render_404 unless can?(current_user, :update_merge_request, @merge_request)
D
Dmitriy Zaporozhets 已提交
511 512 513
  end

  def authorize_admin_merge_request!
514
    return render_404 unless can?(current_user, :admin_merge_request, @merge_request)
D
Dmitriy Zaporozhets 已提交
515
  end
516

517 518 519 520
  def authorize_can_resolve_conflicts!
    return render_404 unless @merge_request.conflicts_can_be_resolved_by?(current_user)
  end

521
  def module_enabled
F
Felipe Artur 已提交
522
    return render_404 unless @project.feature_available?(:merge_requests, current_user)
523
  end
524 525

  def validates_merge_request
526 527
    # Show git not found page
    # if there is no saved commits between source & target branch
528
    if @merge_request.has_no_commits?
529 530
      # and if target branch doesn't exist
      return invalid_mr unless @merge_request.target_branch_exists?
531
    end
532 533 534
  end

  def define_show_vars
535
    @noteable = @merge_request
536
    @commits_count = @merge_request.commits_count
537 538 539 540 541

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

543
    labels
544
    define_pipelines_vars
545 546
  end

547 548 549
  # 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
550
    # Build a note object for comment form
551
    @note = @project.notes.new(noteable: @merge_request)
552

553
    @discussions = @merge_request.discussions
554
    @notes = prepare_notes_for_rendering(@discussions.flat_map(&:notes))
555 556
  end

557
  def define_widget_vars
558
    @pipeline = @merge_request.head_pipeline
559 560
  end

S
Sean McGivern 已提交
561 562 563 564 565
  def define_commit_vars
    @commit = @merge_request.diff_head_commit
    @base_commit = @merge_request.diff_base_commit || @merge_request.likely_diff_base_commit
  end

D
Douwe Maan 已提交
566 567 568 569 570 571 572 573 574 575 576 577
  def define_diff_vars
    @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?
D
Douwe Maan 已提交
578 579
      @start_sha = params[:start_sha]
      @start_version = @comparable_diffs.find { |diff| diff.head_commit_sha == @start_sha }
D
Douwe Maan 已提交
580

D
Douwe Maan 已提交
581 582 583 584
      unless @start_version
        @start_sha = @merge_request_diff.head_commit_sha
        @start_version = @merge_request_diff
      end
D
Douwe Maan 已提交
585 586 587 588 589 590 591 592 593 594
    end

    @diffs =
      if @start_sha
        @merge_request_diff.compare_with(@start_sha).diffs(diff_options)
      else
        @merge_request_diff.diffs(diff_options)
      end
  end

S
Sean McGivern 已提交
595
  def define_diff_comment_vars
596
    @new_diff_note_attrs = {
S
Sean McGivern 已提交
597 598 599 600
      noteable_type: 'MergeRequest',
      noteable_id: @merge_request.id
    }

D
Douwe Maan 已提交
601 602
    @diff_notes_disabled = !@merge_request_diff.latest? || @start_sha

603
    @use_legacy_diff_notes = !@merge_request.has_complete_diff_refs?
604

605
    @grouped_diff_discussions = @merge_request.grouped_diff_discussions(@merge_request_diff.diff_refs)
606
    @notes = prepare_notes_for_rendering(@grouped_diff_discussions.values.flatten.flat_map(&:notes))
S
Sean McGivern 已提交
607 608
  end

609 610
  def define_pipelines_vars
    @pipelines = @merge_request.all_pipelines
611
    @pipeline = @merge_request.head_pipeline
612
    @statuses_count = @pipeline.present? ? @pipeline.statuses.relevant.count : 0
613 614
  end

615 616 617 618 619 620 621 622 623 624 625 626 627 628 629
  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

630 631
    @note_counts = Note.where(commit_id: @commits.map(&:id)).
      group(:commit_id).count
632

633 634
    @labels = LabelsFinder.new(current_user, project_id: @project.id).execute

635 636
    @show_changes_tab = params[:show_changes].present?

637
    define_pipelines_vars
638 639
  end

640
  def invalid_mr
641
    # Render special view for MR with removed target branch
642 643 644
    render 'invalid'
  end

645
  def merge_request_params
D
Douwe Maan 已提交
646 647
    params.require(:merge_request)
      .permit(merge_request_params_ce)
648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666
  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: []
    ]
667
  end
668

Z
Zeger-Jan van de Weg 已提交
669 670 671 672
  def merge_params
    params.permit(:should_remove_source_branch, :commit_message)
  end

673 674 675 676 677
  # 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
678

J
James Lopez 已提交
679 680
  def merge_when_pipeline_succeeds_active?
    params[:merge_when_pipeline_succeeds].present? &&
681
      @merge_request.head_pipeline && @merge_request.head_pipeline.active?
682
  end
S
Sean McGivern 已提交
683 684 685

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

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