merge_requests_controller.rb 19.0 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 44 45 46
    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 已提交
47

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

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

D
Douwe Maan 已提交
63 64 65 66
      format.json do
        render json: @merge_request
      end

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

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

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

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

81
  def diffs
82 83
    apply_diff_view_cookie!

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

91 92 93 94 95
    @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]
96 97 98 99 100
      @start_version = @comparable_diffs.find { |diff| diff.head_commit_sha == @start_sha }

      unless @start_version
        render_404
      end
101 102
    end

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

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

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

    define_commit_vars

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

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

        render 'show'
      end
142 143 144 145 146 147 148 149 150
      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
151
    end
152 153
  end

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

299
  def merge_check
300
    @merge_request.check_if_can_be_merged
301

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

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

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

311
  def merge
312
    return access_denied! unless @merge_request.can_be_merged_by?(current_user)
313

314 315 316
    # 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 已提交
317 318 319 320
      @status = :failed
      return
    end

321
    if params[:sha] != @merge_request.diff_head_sha
322 323 324 325
      @status = :sha_mismatch
      return
    end

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

328 329 330 331 332 333 334
    if params[:merge_when_build_succeeds].present?
      unless @merge_request.pipeline
        @status = :failed
        return
      end

      if @merge_request.pipeline.active?
335 336 337
        MergeRequests::MergeWhenBuildSucceedsService.new(@project, current_user, merge_params)
                                                        .execute(@merge_request)
        @status = :merge_when_build_succeeds
Z
Z.J. van de Weg 已提交
338 339 340
      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
341 342 343 344 345
        MergeWorker.perform_async(@merge_request.id, current_user.id, params)
        @status = :success
      else
        @status = :failed
      end
346
    else
Z
Zeger-Jan van de Weg 已提交
347 348
      MergeWorker.perform_async(@merge_request.id, current_user.id, params)
      @status = :success
349
    end
R
randx 已提交
350 351
  end

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

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

I
Izaak Alpert 已提交
365 366
  def update_branches
    @target_project = selected_target_project
I
Izaak Alpert 已提交
367
    @target_branches = @target_project.repository.branch_names
368

P
Phil Hughes 已提交
369
    render layout: false
I
Izaak Alpert 已提交
370 371
  end

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

391
  def ci_status
392 393 394 395
    pipeline = @merge_request.pipeline
    if pipeline
      status = pipeline.status
      coverage = pipeline.try(:coverage)
396

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

399
      status ||= "preparing"
400 401
    else
      ci_service = @merge_request.source_project.ci_service
402
      status = ci_service.commit_status(merge_request.diff_head_sha, merge_request.source_branch) if ci_service
403

404
      if ci_service.respond_to?(:commit_coverage)
405
        coverage = ci_service.commit_coverage(merge_request.diff_head_sha, merge_request.source_branch)
406
      end
407 408
    end

409 410 411 412 413 414 415 416 417 418 419
    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 已提交
420
    environments =
Z
Z.J. van de Weg 已提交
421 422 423 424
      begin
        @merge_request.environments.map do |environment|
          next unless can?(current_user, :read_environment, environment)

Z
Z.J. van de Weg 已提交
425
          project = environment.project
Z
Z.J. van de Weg 已提交
426 427
          deployment = environment.first_deployment_for(@merge_request.diff_head_commit)

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

Z
Z.J. van de Weg 已提交
446
    render json: environments
447 448
  end

D
Dmitriy Zaporozhets 已提交
449 450
  protected

I
Izaak Alpert 已提交
451
  def selected_target_project
452 453 454 455 456
    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 已提交
457 458
  end

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

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

  def authorize_admin_merge_request!
471
    return render_404 unless can?(current_user, :admin_merge_request, @merge_request)
D
Dmitriy Zaporozhets 已提交
472
  end
473

474 475 476 477
  def authorize_can_resolve_conflicts!
    return render_404 unless @merge_request.conflicts_can_be_resolved_by?(current_user)
  end

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

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

  def define_show_vars
492 493 494 495 496 497 498
    @noteable = @merge_request
    @commits_count = @merge_request.commits.count

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

    define_pipelines_vars
501 502
  end

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

509
    @discussions = @merge_request.discussions
510

511 512
    preload_noteable_for_regular_notes(@discussions.flat_map(&:notes))

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

S
Stan Hu 已提交
523
    preload_max_access_for_authors(@notes, @project)
524 525
  end

526
  def define_widget_vars
527
    @pipeline = @merge_request.pipeline
528 529
  end

S
Sean McGivern 已提交
530 531 532 533 534 535 536 537 538 539 540
  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
    }

541
    @use_legacy_diff_notes = !@merge_request.has_complete_diff_refs?
D
Douwe Maan 已提交
542
    @grouped_diff_discussions = @merge_request.notes.inc_relations_for_view.grouped_diff_discussions
S
Sean McGivern 已提交
543 544

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

554 555 556
  def define_pipelines_vars
    @pipelines = @merge_request.all_pipelines

557
    if @pipelines.present?
558 559 560 561 562
      @pipeline = @pipelines.first
      @statuses = @pipeline.statuses.relevant
    end
  end

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

581 582
    @labels = LabelsFinder.new(current_user, project_id: @project.id).execute

583
    define_pipelines_vars
584 585
  end

586
  def invalid_mr
587
    # Render special view for MR with removed target branch
588 589 590
    render 'invalid'
  end

591
  def merge_request_params
592
    params.require(:merge_request).permit(
593 594
      :title, :assignee_id, :source_project_id, :source_branch,
      :target_project_id, :target_branch, :milestone_id,
595
      :state_event, :description, :task_num, :force_remove_source_branch,
596
      :lock_version, label_ids: []
597 598
    )
  end
599

Z
Zeger-Jan van de Weg 已提交
600 601 602 603
  def merge_params
    params.permit(:should_remove_source_branch, :commit_message)
  end

604 605 606 607 608
  # 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
609 610 611 612 613

  def merge_when_build_succeeds_active?
    params[:merge_when_build_succeeds].present? &&
      @merge_request.pipeline && @merge_request.pipeline.active?
  end
S
Sean McGivern 已提交
614 615 616

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

620
  def compared_diff_version
621 622
    @diff_notes_disabled = true
    @diffs = @merge_request_diff.compare_with(@start_sha).diffs(diff_options)
623
  end
624 625

  def original_diff_version
626
    @diff_notes_disabled = !@merge_request_diff.latest?
627 628
    @diffs = @merge_request_diff.diffs(diff_options)
  end
629 630 631 632 633 634

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