merge_requests_controller.rb 18.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: [
D
Douwe Maan 已提交
12
    :edit, :update, :show, :diffs, :commits, :conflicts, :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]
D
Douwe Maan 已提交
16
  before_action :define_show_vars, only: [:show, :diffs, :commits, :conflicts, :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]
D
Douwe Maan 已提交
20
  before_action :ensure_ref_fetched, only: [:show, :diffs, :commits, :builds, :conflicts, :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 37
  before_action :authorize_can_resolve_conflicts!, only: [:conflicts, :resolve_conflicts]

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
  def resolve_conflicts
174 175 176 177 178 179 180
    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

181
    begin
182
      MergeRequests::ResolveService.new(@merge_request.source_project, current_user, params).execute(@merge_request)
183

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

186
      render json: { redirect_to: namespace_project_merge_request_url(@project.namespace, @project, @merge_request, resolved_conflicts: true) }
187 188 189
    rescue Gitlab::Conflict::File::MissingResolution => e
      render status: :bad_request, json: { message: e.message }
    end
190 191
  end

D
Douwe Maan 已提交
192 193
  def builds
    respond_to do |format|
194 195 196 197 198
      format.html do
        define_discussion_vars

        render 'show'
      end
D
Douwe Maan 已提交
199 200 201 202
      format.json { render json: { html: view_to_html_string('projects/merge_requests/show/_builds') } }
    end
  end

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

206 207 208 209 210 211 212 213 214 215
    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 已提交
216
  def new
217 218
    define_new_vars
  end
D
Douwe Maan 已提交
219

220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236
  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 已提交
237 238 239
  end

  def create
I
Izaak Alpert 已提交
240
    @target_branches ||= []
241
    @merge_request = MergeRequests::CreateService.new(project, current_user, merge_request_params).execute
242 243

    if @merge_request.valid?
244
      redirect_to(merge_request_path(@merge_request))
245
    else
I
Izaak Alpert 已提交
246 247 248
      @source_project = @merge_request.source_project
      @target_project = @merge_request.target_project
      render action: "new"
D
Dmitriy Zaporozhets 已提交
249 250 251
    end
  end

D
Douwe Maan 已提交
252 253 254 255 256 257
  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 已提交
258
  def update
259
    @merge_request = MergeRequests::UpdateService.new(project, current_user, merge_request_params).execute(@merge_request)
260

261
    if @merge_request.valid?
262 263
      respond_to do |format|
        format.html do
V
Vinnie Okada 已提交
264
          redirect_to([@merge_request.target_project.namespace.becomes(Namespace),
265
                       @merge_request.target_project, @merge_request])
266
        end
267
        format.json do
268
          render json: @merge_request.to_json(include: { milestone: {}, assignee: { methods: :avatar_url }, labels: { methods: :text_color } })
269
        end
270
      end
271
    else
272
      render "edit"
D
Dmitriy Zaporozhets 已提交
273
    end
274 275 276
  rescue ActiveRecord::StaleObjectError
    @conflict = true
    render :edit
D
Dmitriy Zaporozhets 已提交
277 278
  end

279
  def remove_wip
T
Thomas Balthazar 已提交
280
    MergeRequests::UpdateService.new(project, current_user, wip_event: 'unwip').execute(@merge_request)
281 282 283 284 285

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

286
  def merge_check
287
    @merge_request.check_if_can_be_merged
288

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

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

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

298
  def merge
299
    return access_denied! unless @merge_request.can_be_merged_by?(current_user)
300

301 302 303
    # 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 已提交
304 305 306 307
      @status = :failed
      return
    end

308
    if params[:sha] != @merge_request.diff_head_sha
309 310 311 312
      @status = :sha_mismatch
      return
    end

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

315 316 317 318 319 320 321
    if params[:merge_when_build_succeeds].present?
      unless @merge_request.pipeline
        @status = :failed
        return
      end

      if @merge_request.pipeline.active?
322 323 324
        MergeRequests::MergeWhenBuildSucceedsService.new(@project, current_user, merge_params)
                                                        .execute(@merge_request)
        @status = :merge_when_build_succeeds
Z
Z.J. van de Weg 已提交
325 326 327
      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
328 329 330 331 332
        MergeWorker.perform_async(@merge_request.id, current_user.id, params)
        @status = :success
      else
        @status = :failed
      end
333
    else
Z
Zeger-Jan van de Weg 已提交
334 335
      MergeWorker.perform_async(@merge_request.id, current_user.id, params)
      @status = :success
336
    end
R
randx 已提交
337 338
  end

339
  def branch_from
F
Felipe Artur 已提交
340
    # This is always source
I
Izaak Alpert 已提交
341
    @source_project = @merge_request.nil? ? @project : @merge_request.source_project
342
    @commit = @repository.commit(params[:ref]) if params[:ref].present?
P
Phil Hughes 已提交
343
    render layout: false
344 345 346
  end

  def branch_to
I
Izaak Alpert 已提交
347
    @target_project = selected_target_project
348
    @commit = @target_project.commit(params[:ref]) if params[:ref].present?
P
Phil Hughes 已提交
349
    render layout: false
350 351
  end

I
Izaak Alpert 已提交
352 353
  def update_branches
    @target_project = selected_target_project
I
Izaak Alpert 已提交
354
    @target_branches = @target_project.repository.branch_names
355

P
Phil Hughes 已提交
356
    render layout: false
I
Izaak Alpert 已提交
357 358
  end

359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377
  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

378
  def ci_status
379 380 381 382
    pipeline = @merge_request.pipeline
    if pipeline
      status = pipeline.status
      coverage = pipeline.try(:coverage)
383

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

386
      status ||= "preparing"
387 388
    else
      ci_service = @merge_request.source_project.ci_service
389
      status = ci_service.commit_status(merge_request.diff_head_sha, merge_request.source_branch) if ci_service
390

391
      if ci_service.respond_to?(:commit_coverage)
392
        coverage = ci_service.commit_coverage(merge_request.diff_head_sha, merge_request.source_branch)
393
      end
394 395
    end

396 397 398 399 400 401 402 403 404 405 406 407
    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
    render json: @merge_request.environments.map do |environment|
408 409 410
      next unless can?(current_user, :read_environment, environment)

      deployment = environment.first_deployment_for(@merge_request.diff_head_commit)
411 412

      environment_data = {
413 414 415 416 417 418 419
        name: environment.name,
        id: environment.id,
        url: namespace_project_environment_path(@project.namespace, @project, environment),
        external_url: environment.external_url,
        deployed_at: deployment ? deployment.created_at : nil
      }

420 421
      if environment_data[:external_url]
        environment_data[:external_url_formatted] = environment_data[:external_url].gsub(/\A.*?:\/\//, '')
422
      end
423

424 425
      if environment_data[:deployed_at]
        environment_data[:deployed_at_formatted] = environment_data[:deployed_at].to_time.in_time_zone.to_s(:medium)
426
      end
427

428
      environment_data
429
    end.compact
430 431
  end

D
Dmitriy Zaporozhets 已提交
432 433
  protected

I
Izaak Alpert 已提交
434
  def selected_target_project
435 436 437 438 439
    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 已提交
440 441
  end

D
Dmitriy Zaporozhets 已提交
442
  def merge_request
443
    @issuable = @merge_request ||= @project.merge_requests.find_by!(iid: params[:id])
D
Dmitriy Zaporozhets 已提交
444
  end
445
  alias_method :subscribable_resource, :merge_request
446
  alias_method :issuable, :merge_request
447
  alias_method :awardable, :merge_request
D
Dmitriy Zaporozhets 已提交
448

D
Dmitriy Zaporozhets 已提交
449
  def authorize_update_merge_request!
450
    return render_404 unless can?(current_user, :update_merge_request, @merge_request)
D
Dmitriy Zaporozhets 已提交
451 452 453
  end

  def authorize_admin_merge_request!
454
    return render_404 unless can?(current_user, :admin_merge_request, @merge_request)
D
Dmitriy Zaporozhets 已提交
455
  end
456

457 458 459 460
  def authorize_can_resolve_conflicts!
    return render_404 unless @merge_request.conflicts_can_be_resolved_by?(current_user)
  end

461
  def module_enabled
F
Felipe Artur 已提交
462
    return render_404 unless @project.feature_available?(:merge_requests, current_user)
463
  end
464 465

  def validates_merge_request
466 467 468
    # Show git not found page
    # if there is no saved commits between source & target branch
    if @merge_request.commits.blank?
469 470
      # and if target branch doesn't exist
      return invalid_mr unless @merge_request.target_branch_exists?
471
    end
472 473 474
  end

  def define_show_vars
475 476 477 478
    @noteable = @merge_request
    @commits_count = @merge_request.commits.count

    @pipeline = @merge_request.pipeline
479
    @statuses = @pipeline.statuses.relevant if @pipeline
480 481 482 483 484 485 486

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

487 488 489
  # 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
490
    # Build a note object for comment form
491
    @note = @project.notes.new(noteable: @merge_request)
492

493
    @discussions = @merge_request.discussions
494

495 496
    preload_noteable_for_regular_notes(@discussions.flat_map(&:notes))

497
    # This is not executed lazily
498
    @notes = Banzai::NoteRenderer.render(
499
      @discussions.flat_map(&:notes),
500 501 502 503 504 505
      @project,
      current_user,
      @path,
      @project_wiki,
      @ref
    )
506

S
Stan Hu 已提交
507
    preload_max_access_for_authors(@notes, @project)
508 509
  end

510
  def define_widget_vars
511 512
    @pipeline = @merge_request.pipeline
    @pipelines = [@pipeline].compact
513 514
  end

S
Sean McGivern 已提交
515 516 517 518 519 520 521 522 523 524 525
  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
    }

526
    @use_legacy_diff_notes = !@merge_request.has_complete_diff_refs?
D
Douwe Maan 已提交
527
    @grouped_diff_discussions = @merge_request.notes.inc_relations_for_view.grouped_diff_discussions
S
Sean McGivern 已提交
528 529

    Banzai::NoteRenderer.render(
530
      @grouped_diff_discussions.values.flat_map(&:notes),
S
Sean McGivern 已提交
531 532 533 534 535 536 537 538
      @project,
      current_user,
      @path,
      @project_wiki,
      @ref
    )
  end

539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559
  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

    @pipeline = @merge_request.pipeline
    @statuses = @pipeline.statuses.relevant if @pipeline
    @note_counts = Note.where(commit_id: @commits.map(&:id)).
      group(:commit_id).count
  end

560
  def invalid_mr
561
    # Render special view for MR with removed target branch
562 563 564
    render 'invalid'
  end

565
  def merge_request_params
566
    params.require(:merge_request).permit(
567 568
      :title, :assignee_id, :source_project_id, :source_branch,
      :target_project_id, :target_branch, :milestone_id,
569
      :state_event, :description, :task_num, :force_remove_source_branch,
570
      :lock_version, label_ids: []
571 572
    )
  end
573

Z
Zeger-Jan van de Weg 已提交
574 575 576 577
  def merge_params
    params.permit(:should_remove_source_branch, :commit_message)
  end

578 579 580 581 582
  # 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
583 584 585 586 587

  def merge_when_build_succeeds_active?
    params[:merge_when_build_succeeds].present? &&
      @merge_request.pipeline && @merge_request.pipeline.active?
  end
S
Sean McGivern 已提交
588 589 590

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

594
  def compared_diff_version
595 596
    @diff_notes_disabled = true
    @diffs = @merge_request_diff.compare_with(@start_sha).diffs(diff_options)
597
  end
598 599

  def original_diff_version
600
    @diff_notes_disabled = !@merge_request_diff.latest?
601 602
    @diffs = @merge_request_diff.diffs(diff_options)
  end
603 604 605 606 607 608

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