merge_requests_controller.rb 19.3 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, :builds, :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, :builds, :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
    @merge_requests = merge_requests_collection
40
    @merge_requests = @merge_requests.page(params[:page])
41

42 43 44 45
    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 已提交
46

47 48 49 50
    respond_to do |format|
      format.html
      format.json do
        render json: {
51
          html: view_to_html_string("projects/merge_requests/_merge_requests"),
P
Phil Hughes 已提交
52
          labels: @labels.as_json(methods: :text_color)
53 54 55
        }
      end
    end
D
Dmitriy Zaporozhets 已提交
56 57 58
  end

  def show
59
    respond_to do |format|
60
      format.html { define_discussion_vars }
S
Sean McGivern 已提交
61

D
Douwe Maan 已提交
62
      format.json do
63
        render json: MergeRequestSerializer.new.represent(@merge_request)
D
Douwe Maan 已提交
64 65
      end

Z
Z.J. van de Weg 已提交
66
      format.patch  do
D
Douwe Maan 已提交
67 68 69
        return render_404 unless @merge_request.diff_refs

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

72
      format.diff do
D
Douwe Maan 已提交
73
        return render_404 unless @merge_request.diff_refs
74

D
Douwe Maan 已提交
75
        send_git_diff @project.repository, @merge_request.diff_refs
76
      end
77
    end
R
randx 已提交
78 79
  end

80
  def diffs
81 82
    apply_diff_view_cookie!

83 84
    @merge_request_diff =
      if params[:diff_id]
85
        @merge_request.merge_request_diffs.viewable.find(params[:diff_id])
86 87 88
      else
        @merge_request.merge_request_diff
      end
89

90
    @merge_request_diffs = @merge_request.merge_request_diffs.viewable.select_without_diff
91 92 93 94
    @comparable_diffs = @merge_request_diffs.select { |diff| diff.id < @merge_request_diff.id }

    if params[:start_sha].present?
      @start_sha = params[:start_sha]
95 96 97 98 99
      @start_version = @comparable_diffs.find { |diff| diff.head_commit_sha == @start_sha }

      unless @start_version
        render_404
      end
100 101
    end

102
    respond_to do |format|
103
      format.html { define_discussion_vars }
104
      format.json do
105 106
        if @start_sha
          compared_diff_version
107
        else
108
          original_diff_version
109
        end
110 111 112

        render json: { html: view_to_html_string("projects/merge_requests/show/_diffs") }
      end
113
    end
D
Dmitriy Zaporozhets 已提交
114 115
  end

S
Sean McGivern 已提交
116 117 118 119 120 121 122 123 124 125
  # 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
126
      @grouped_diff_discussions = {}
S
Sean McGivern 已提交
127 128 129 130
    end

    define_commit_vars

131
    render_diff_for_path(@merge_request.diffs(diff_options))
S
Sean McGivern 已提交
132 133
  end

134
  def commits
135
    respond_to do |format|
136 137 138 139 140
      format.html do
        define_discussion_vars

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

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

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

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

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

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

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

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

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

D
Douwe Maan 已提交
204 205
  def builds
    respond_to do |format|
206 207 208 209 210
      format.html do
        define_discussion_vars

        render 'show'
      end
D
Douwe Maan 已提交
211 212 213 214
      format.json { render json: { html: view_to_html_string('projects/merge_requests/show/_builds') } }
    end
  end

215
  def pipelines
216
    @pipelines = @merge_request.all_pipelines
217

218 219 220 221 222 223 224 225 226 227
    respond_to do |format|
      format.html do
        define_discussion_vars

        render 'show'
      end
      format.json { render json: { html: view_to_html_string('projects/merge_requests/show/_pipelines') } }
    end
  end

D
Dmitriy Zaporozhets 已提交
228
  def new
229 230
    define_new_vars
  end
D
Douwe Maan 已提交
231

232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248
  def new_diffs
    respond_to do |format|
      format.html do
        define_new_vars
        render "new"
      end
      format.json do
        @diffs = if @merge_request.can_be_created
                   @merge_request.diffs(diff_options)
                 else
                   []
                 end
        @diff_notes_disabled = true

        render json: { html: view_to_html_string('projects/merge_requests/_new_diffs', diffs: @diffs) }
      end
    end
D
Dmitriy Zaporozhets 已提交
249 250 251
  end

  def create
I
Izaak Alpert 已提交
252
    @target_branches ||= []
253
    @merge_request = MergeRequests::CreateService.new(project, current_user, merge_request_params).execute
254 255

    if @merge_request.valid?
256
      redirect_to(merge_request_path(@merge_request))
257
    else
I
Izaak Alpert 已提交
258 259 260
      @source_project = @merge_request.source_project
      @target_project = @merge_request.target_project
      render action: "new"
D
Dmitriy Zaporozhets 已提交
261 262 263
    end
  end

D
Douwe Maan 已提交
264 265 266 267 268 269
  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 已提交
270
  def update
271
    @merge_request = MergeRequests::UpdateService.new(project, current_user, merge_request_params).execute(@merge_request)
272

273
    if @merge_request.valid?
274 275
      respond_to do |format|
        format.html do
V
Vinnie Okada 已提交
276
          redirect_to([@merge_request.target_project.namespace.becomes(Namespace),
277
                       @merge_request.target_project, @merge_request])
278
        end
279
        format.json do
280
          render json: @merge_request.to_json(include: { milestone: {}, assignee: { methods: :avatar_url }, labels: { methods: :text_color } }, methods: [:task_status, :task_status_short])
281
        end
282
      end
283
    else
284
      render "edit"
D
Dmitriy Zaporozhets 已提交
285
    end
286 287 288
  rescue ActiveRecord::StaleObjectError
    @conflict = true
    render :edit
D
Dmitriy Zaporozhets 已提交
289 290
  end

291
  def remove_wip
T
Thomas Balthazar 已提交
292
    MergeRequests::UpdateService.new(project, current_user, wip_event: 'unwip').execute(@merge_request)
293 294 295 296 297

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

298
  def merge_check
299
    @merge_request.check_if_can_be_merged
300

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

Z
Zeger-Jan van de Weg 已提交
304
  def cancel_merge_when_build_succeeds
305 306 307
    unless @merge_request.can_cancel_merge_when_build_succeeds?(current_user)
      return access_denied!
    end
Z
Zeger-Jan van de Weg 已提交
308

309 310 311
    MergeRequests::MergeWhenPipelineSucceedsService
      .new(@project, current_user)
      .cancel(@merge_request)
Z
Zeger-Jan van de Weg 已提交
312 313
  end

314
  def merge
315
    return access_denied! unless @merge_request.can_be_merged_by?(current_user)
316

317 318 319
    # 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 已提交
320 321 322 323
      @status = :failed
      return
    end

324
    if params[:sha] != @merge_request.diff_head_sha
325 326 327 328
      @status = :sha_mismatch
      return
    end

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

331
    if params[:merge_when_build_succeeds].present?
332
      unless @merge_request.head_pipeline
333 334 335 336
        @status = :failed
        return
      end

337
      if @merge_request.head_pipeline.active?
338 339 340
        MergeRequests::MergeWhenPipelineSucceedsService
          .new(@project, current_user, merge_params)
          .execute(@merge_request)
341

342
        @status = :merge_when_build_succeeds
343
      elsif @merge_request.head_pipeline.success?
Z
Z.J. van de Weg 已提交
344 345
        # This can be triggered when a user clicks the auto merge button while
        # the tests finish at about the same time
346 347 348 349 350
        MergeWorker.perform_async(@merge_request.id, current_user.id, params)
        @status = :success
      else
        @status = :failed
      end
351
    else
Z
Zeger-Jan van de Weg 已提交
352 353
      MergeWorker.perform_async(@merge_request.id, current_user.id, params)
      @status = :success
354
    end
R
randx 已提交
355 356
  end

357
  def branch_from
F
Felipe Artur 已提交
358
    # This is always source
I
Izaak Alpert 已提交
359
    @source_project = @merge_request.nil? ? @project : @merge_request.source_project
360 361 362 363 364 365

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

P
Phil Hughes 已提交
366
    render layout: false
367 368 369
  end

  def branch_to
I
Izaak Alpert 已提交
370
    @target_project = selected_target_project
371 372 373 374 375 376

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

P
Phil Hughes 已提交
377
    render layout: false
378 379
  end

I
Izaak Alpert 已提交
380 381
  def update_branches
    @target_project = selected_target_project
I
Izaak Alpert 已提交
382
    @target_branches = @target_project.repository.branch_names
383

P
Phil Hughes 已提交
384
    render layout: false
I
Izaak Alpert 已提交
385 386
  end

387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405
  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

406
  def ci_status
407 408
    pipeline = @merge_request.head_pipeline

409 410 411
    if pipeline
      status = pipeline.status
      coverage = pipeline.try(:coverage)
412

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

415
      status ||= "preparing"
416
    else
417
      ci_service = @merge_request.source_project.try(:ci_service)
418
      status = ci_service.commit_status(merge_request.diff_head_sha, merge_request.source_branch) if ci_service
419

420
      if ci_service.respond_to?(:commit_coverage)
421
        coverage = ci_service.commit_coverage(merge_request.diff_head_sha, merge_request.source_branch)
422
      end
423 424
    end

425 426
    response = {
      title: merge_request.title,
427
      sha: (merge_request.diff_head_commit.short_id if merge_request.diff_head_sha),
428 429 430 431 432 433 434 435
      status: status,
      coverage: coverage
    }

    render json: response
  end

  def ci_environments_status
Z
Z.J. van de Weg 已提交
436
    environments =
Z
Z.J. van de Weg 已提交
437 438 439 440
      begin
        @merge_request.environments.map do |environment|
          next unless can?(current_user, :read_environment, environment)

Z
Z.J. van de Weg 已提交
441
          project = environment.project
Z
Z.J. van de Weg 已提交
442 443
          deployment = environment.first_deployment_for(@merge_request.diff_head_commit)

K
Kamil Trzcinski 已提交
444 445 446 447 448
          stop_url =
            if environment.stoppable? && can?(current_user, :create_deployment, environment)
              stop_namespace_project_environment_path(project.namespace, project, environment)
            end

Z
Z.J. van de Weg 已提交
449
          {
Z
Z.J. van de Weg 已提交
450
            id: environment.id,
Z
Z.J. van de Weg 已提交
451
            name: environment.name,
Z
Z.J. van de Weg 已提交
452
            url: namespace_project_environment_path(project.namespace, project, environment),
K
Kamil Trzcinski 已提交
453
            stop_url: stop_url,
Z
Z.J. van de Weg 已提交
454
            external_url: environment.external_url,
Z
Z.J. van de Weg 已提交
455 456 457
            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 已提交
458 459
          }
        end.compact
460
      end
461

Z
Z.J. van de Weg 已提交
462
    render json: environments
463 464
  end

D
Dmitriy Zaporozhets 已提交
465 466
  protected

I
Izaak Alpert 已提交
467
  def selected_target_project
468 469 470 471 472
    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 已提交
473 474
  end

D
Dmitriy Zaporozhets 已提交
475
  def merge_request
476
    @issuable = @merge_request ||= @project.merge_requests.find_by!(iid: params[:id])
D
Dmitriy Zaporozhets 已提交
477
  end
478
  alias_method :subscribable_resource, :merge_request
479
  alias_method :issuable, :merge_request
480
  alias_method :awardable, :merge_request
D
Dmitriy Zaporozhets 已提交
481

D
Dmitriy Zaporozhets 已提交
482
  def authorize_update_merge_request!
483
    return render_404 unless can?(current_user, :update_merge_request, @merge_request)
D
Dmitriy Zaporozhets 已提交
484 485 486
  end

  def authorize_admin_merge_request!
487
    return render_404 unless can?(current_user, :admin_merge_request, @merge_request)
D
Dmitriy Zaporozhets 已提交
488
  end
489

490 491 492 493
  def authorize_can_resolve_conflicts!
    return render_404 unless @merge_request.conflicts_can_be_resolved_by?(current_user)
  end

494
  def module_enabled
F
Felipe Artur 已提交
495
    return render_404 unless @project.feature_available?(:merge_requests, current_user)
496
  end
497 498

  def validates_merge_request
499 500
    # Show git not found page
    # if there is no saved commits between source & target branch
501
    if @merge_request.has_no_commits?
502 503
      # and if target branch doesn't exist
      return invalid_mr unless @merge_request.target_branch_exists?
504
    end
505 506 507
  end

  def define_show_vars
508
    @noteable = @merge_request
509
    @commits_count = @merge_request.commits_count
510 511 512 513 514

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

516
    labels
517
    define_pipelines_vars
518 519
  end

520 521 522
  # 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
523
    # Build a note object for comment form
524
    @note = @project.notes.new(noteable: @merge_request)
525

526
    @discussions = @merge_request.discussions
527

528 529
    preload_noteable_for_regular_notes(@discussions.flat_map(&:notes))

530
    # This is not executed lazily
531
    @notes = Banzai::NoteRenderer.render(
532
      @discussions.flat_map(&:notes),
533 534 535 536 537 538
      @project,
      current_user,
      @path,
      @project_wiki,
      @ref
    )
539

S
Stan Hu 已提交
540
    preload_max_access_for_authors(@notes, @project)
541 542
  end

543
  def define_widget_vars
544
    @pipeline = @merge_request.head_pipeline
545 546
  end

S
Sean McGivern 已提交
547 548 549 550 551 552 553 554 555 556 557
  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
    }

558
    @use_legacy_diff_notes = !@merge_request.has_complete_diff_refs?
D
Douwe Maan 已提交
559
    @grouped_diff_discussions = @merge_request.notes.inc_relations_for_view.grouped_diff_discussions
S
Sean McGivern 已提交
560 561

    Banzai::NoteRenderer.render(
562
      @grouped_diff_discussions.values.flat_map(&:notes),
S
Sean McGivern 已提交
563 564 565 566 567 568 569 570
      @project,
      current_user,
      @path,
      @project_wiki,
      @ref
    )
  end

571 572
  def define_pipelines_vars
    @pipelines = @merge_request.all_pipelines
573
    @pipeline = @merge_request.head_pipeline
574
    @statuses_count = @pipeline.present? ? @pipeline.statuses.relevant.count : 0
575 576
  end

577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593
  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

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

595 596
    @labels = LabelsFinder.new(current_user, project_id: @project.id).execute

597
    define_pipelines_vars
598 599
  end

600
  def invalid_mr
601
    # Render special view for MR with removed target branch
602 603 604
    render 'invalid'
  end

605
  def merge_request_params
606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626
    params.require(:merge_request)
      .permit(merge_request_params_ce)
  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: []
    ]
627
  end
628

Z
Zeger-Jan van de Weg 已提交
629 630 631 632
  def merge_params
    params.permit(:should_remove_source_branch, :commit_message)
  end

633 634 635 636 637
  # 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
638 639 640

  def merge_when_build_succeeds_active?
    params[:merge_when_build_succeeds].present? &&
641
      @merge_request.head_pipeline && @merge_request.head_pipeline.active?
642
  end
S
Sean McGivern 已提交
643 644 645

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

649
  def compared_diff_version
650 651
    @diff_notes_disabled = true
    @diffs = @merge_request_diff.compare_with(@start_sha).diffs(diff_options)
652
  end
653 654

  def original_diff_version
655
    @diff_notes_disabled = !@merge_request_diff.latest?
656 657
    @diffs = @merge_request_diff.diffs(diff_options)
  end
658 659 660 661 662 663

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