merge_requests_controller.rb 18.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
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
    @merge_requests = @merge_requests.preload(:target_project)
42

43
    @labels = @project.labels.where(title: params[:label_name])
T
Tap 已提交
44

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

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

D
Douwe Maan 已提交
60 61 62 63
      format.json do
        render json: @merge_request
      end

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

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

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

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

78
  def diffs
79 80
    apply_diff_view_cookie!

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

88 89 90 91 92
    @merge_request_diffs = @merge_request.merge_request_diffs.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]
93 94 95 96 97
      @start_version = @comparable_diffs.find { |diff| diff.head_commit_sha == @start_sha }

      unless @start_version
        render_404
      end
98 99
    end

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

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

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

    define_commit_vars

129
    render_diff_for_path(@merge_request.diffs(diff_options))
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 143 144 145 146 147
      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
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

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

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

213
  def pipelines
214
    @pipelines = @merge_request.all_pipelines
215

216 217 218 219 220 221 222 223 224 225
    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 已提交
226
  def new
227 228
    define_new_vars
  end
D
Douwe Maan 已提交
229

230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246
  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 已提交
247 248 249
  end

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

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

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

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

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

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

296
  def merge_check
297
    @merge_request.check_if_can_be_merged
298

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

Z
Zeger-Jan van de Weg 已提交
302
  def cancel_merge_when_build_succeeds
303
    return access_denied! unless @merge_request.can_cancel_merge_when_build_succeeds?(current_user)
Z
Zeger-Jan van de Weg 已提交
304

305
    MergeRequests::MergeWhenBuildSucceedsService.new(@project, current_user).cancel(@merge_request)
Z
Zeger-Jan van de Weg 已提交
306 307
  end

308
  def merge
309
    return access_denied! unless @merge_request.can_be_merged_by?(current_user)
310

311 312 313
    # 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 已提交
314 315 316 317
      @status = :failed
      return
    end

318
    if params[:sha] != @merge_request.diff_head_sha
319 320 321 322
      @status = :sha_mismatch
      return
    end

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

325 326 327 328 329 330 331
    if params[:merge_when_build_succeeds].present?
      unless @merge_request.pipeline
        @status = :failed
        return
      end

      if @merge_request.pipeline.active?
332 333 334
        MergeRequests::MergeWhenBuildSucceedsService.new(@project, current_user, merge_params)
                                                        .execute(@merge_request)
        @status = :merge_when_build_succeeds
Z
Z.J. van de Weg 已提交
335 336 337
      elsif @merge_request.pipeline.success?
        # This can be triggered when a user clicks the auto merge button while
        # the tests finish at about the same time
338 339 340 341 342
        MergeWorker.perform_async(@merge_request.id, current_user.id, params)
        @status = :success
      else
        @status = :failed
      end
343
    else
Z
Zeger-Jan van de Weg 已提交
344 345
      MergeWorker.perform_async(@merge_request.id, current_user.id, params)
      @status = :success
346
    end
R
randx 已提交
347 348
  end

349
  def branch_from
F
Felipe Artur 已提交
350
    # This is always source
I
Izaak Alpert 已提交
351
    @source_project = @merge_request.nil? ? @project : @merge_request.source_project
352
    @commit = @repository.commit(params[:ref]) if params[:ref].present?
P
Phil Hughes 已提交
353
    render layout: false
354 355 356
  end

  def branch_to
I
Izaak Alpert 已提交
357
    @target_project = selected_target_project
358
    @commit = @target_project.commit(params[:ref]) if params[:ref].present?
P
Phil Hughes 已提交
359
    render layout: false
360 361
  end

I
Izaak Alpert 已提交
362 363
  def update_branches
    @target_project = selected_target_project
I
Izaak Alpert 已提交
364
    @target_branches = @target_project.repository.branch_names
365

P
Phil Hughes 已提交
366
    render layout: false
I
Izaak Alpert 已提交
367 368
  end

369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387
  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

388
  def ci_status
389 390 391 392
    pipeline = @merge_request.pipeline
    if pipeline
      status = pipeline.status
      coverage = pipeline.try(:coverage)
393

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

396
      status ||= "preparing"
397 398
    else
      ci_service = @merge_request.source_project.ci_service
399
      status = ci_service.commit_status(merge_request.diff_head_sha, merge_request.source_branch) if ci_service
400

401
      if ci_service.respond_to?(:commit_coverage)
402
        coverage = ci_service.commit_coverage(merge_request.diff_head_sha, merge_request.source_branch)
403
      end
404 405
    end

406 407 408 409 410 411 412 413 414 415 416
    response = {
      title: merge_request.title,
      sha: merge_request.diff_head_commit.short_id,
      status: status,
      coverage: coverage
    }

    render json: response
  end

  def ci_environments_status
Z
Z.J. van de Weg 已提交
417
    environments =
Z
Z.J. van de Weg 已提交
418 419 420 421
      begin
        @merge_request.environments.map do |environment|
          next unless can?(current_user, :read_environment, environment)

Z
Z.J. van de Weg 已提交
422
          project = environment.project
Z
Z.J. van de Weg 已提交
423 424
          deployment = environment.first_deployment_for(@merge_request.diff_head_commit)

K
Kamil Trzcinski 已提交
425 426 427 428 429
          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 已提交
430
          {
Z
Z.J. van de Weg 已提交
431
            id: environment.id,
Z
Z.J. van de Weg 已提交
432
            name: environment.name,
Z
Z.J. van de Weg 已提交
433
            url: namespace_project_environment_path(project.namespace, project, environment),
K
Kamil Trzcinski 已提交
434
            stop_url: stop_url,
Z
Z.J. van de Weg 已提交
435
            external_url: environment.external_url,
Z
Z.J. van de Weg 已提交
436 437 438
            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 已提交
439 440
          }
        end.compact
441
      end
442

Z
Z.J. van de Weg 已提交
443
    render json: environments
444 445
  end

D
Dmitriy Zaporozhets 已提交
446 447
  protected

I
Izaak Alpert 已提交
448
  def selected_target_project
449 450 451 452 453
    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 已提交
454 455
  end

D
Dmitriy Zaporozhets 已提交
456
  def merge_request
457
    @issuable = @merge_request ||= @project.merge_requests.find_by!(iid: params[:id])
D
Dmitriy Zaporozhets 已提交
458
  end
459
  alias_method :subscribable_resource, :merge_request
460
  alias_method :issuable, :merge_request
461
  alias_method :awardable, :merge_request
D
Dmitriy Zaporozhets 已提交
462

D
Dmitriy Zaporozhets 已提交
463
  def authorize_update_merge_request!
464
    return render_404 unless can?(current_user, :update_merge_request, @merge_request)
D
Dmitriy Zaporozhets 已提交
465 466 467
  end

  def authorize_admin_merge_request!
468
    return render_404 unless can?(current_user, :admin_merge_request, @merge_request)
D
Dmitriy Zaporozhets 已提交
469
  end
470

471 472 473 474
  def authorize_can_resolve_conflicts!
    return render_404 unless @merge_request.conflicts_can_be_resolved_by?(current_user)
  end

475
  def module_enabled
F
Felipe Artur 已提交
476
    return render_404 unless @project.feature_available?(:merge_requests, current_user)
477
  end
478 479

  def validates_merge_request
480 481 482
    # Show git not found page
    # if there is no saved commits between source & target branch
    if @merge_request.commits.blank?
483 484
      # and if target branch doesn't exist
      return invalid_mr unless @merge_request.target_branch_exists?
485
    end
486 487 488
  end

  def define_show_vars
489 490 491 492 493 494 495
    @noteable = @merge_request
    @commits_count = @merge_request.commits.count

    if @merge_request.locked_long_ago?
      @merge_request.unlock_mr
      @merge_request.close
    end
496 497

    define_pipelines_vars
498 499
  end

500 501 502
  # 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
503
    # Build a note object for comment form
504
    @note = @project.notes.new(noteable: @merge_request)
505

506
    @discussions = @merge_request.discussions
507

508 509
    preload_noteable_for_regular_notes(@discussions.flat_map(&:notes))

510
    # This is not executed lazily
511
    @notes = Banzai::NoteRenderer.render(
512
      @discussions.flat_map(&:notes),
513 514 515 516 517 518
      @project,
      current_user,
      @path,
      @project_wiki,
      @ref
    )
519

S
Stan Hu 已提交
520
    preload_max_access_for_authors(@notes, @project)
521 522
  end

523
  def define_widget_vars
524
    @pipeline = @merge_request.pipeline
525 526
  end

S
Sean McGivern 已提交
527 528 529 530 531 532 533 534 535 536 537
  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
    }

538
    @use_legacy_diff_notes = !@merge_request.has_complete_diff_refs?
D
Douwe Maan 已提交
539
    @grouped_diff_discussions = @merge_request.notes.inc_relations_for_view.grouped_diff_discussions
S
Sean McGivern 已提交
540 541

    Banzai::NoteRenderer.render(
542
      @grouped_diff_discussions.values.flat_map(&:notes),
S
Sean McGivern 已提交
543 544 545 546 547 548 549 550
      @project,
      current_user,
      @path,
      @project_wiki,
      @ref
    )
  end

551 552 553 554 555 556 557 558 559
  def define_pipelines_vars
    @pipelines = @merge_request.all_pipelines

    if @pipelines.any?
      @pipeline = @pipelines.first
      @statuses = @pipeline.statuses.relevant
    end
  end

560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576
  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
577 578

    define_pipelines_vars
579 580
  end

581
  def invalid_mr
582
    # Render special view for MR with removed target branch
583 584 585
    render 'invalid'
  end

586
  def merge_request_params
587
    params.require(:merge_request).permit(
588 589
      :title, :assignee_id, :source_project_id, :source_branch,
      :target_project_id, :target_branch, :milestone_id,
590
      :state_event, :description, :task_num, :force_remove_source_branch,
591
      :lock_version, label_ids: []
592 593
    )
  end
594

Z
Zeger-Jan van de Weg 已提交
595 596 597 598
  def merge_params
    params.permit(:should_remove_source_branch, :commit_message)
  end

599 600 601 602 603
  # 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
604 605 606 607 608

  def merge_when_build_succeeds_active?
    params[:merge_when_build_succeeds].present? &&
      @merge_request.pipeline && @merge_request.pipeline.active?
  end
S
Sean McGivern 已提交
609 610 611

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

615
  def compared_diff_version
616 617
    @diff_notes_disabled = true
    @diffs = @merge_request_diff.compare_with(@start_sha).diffs(diff_options)
618
  end
619 620

  def original_diff_version
621
    @diff_notes_disabled = !@merge_request_diff.latest?
622 623
    @diffs = @merge_request_diff.diffs(diff_options)
  end
624 625 626 627 628 629

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