merge_requests_controller.rb 19.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, :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, :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 41
    @merge_requests = @merge_requests.page(params[:page])
    if @merge_requests.out_of_range? && @merge_requests.total_pages != 0
42
      return redirect_to url_for(params.merge(page: @merge_requests.total_pages))
43
    end
44

45 46 47 48
    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 已提交
49

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

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

D
Douwe Maan 已提交
65
      format.json do
66
        render json: MergeRequestSerializer.new.represent(@merge_request)
D
Douwe Maan 已提交
67 68
      end

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

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

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

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

83
  def diffs
84 85
    apply_diff_view_cookie!

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

93
    @merge_request_diffs = @merge_request.merge_request_diffs.viewable.select_without_diff
94 95 96 97
    @comparable_diffs = @merge_request_diffs.select { |diff| diff.id < @merge_request_diff.id }

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

      unless @start_version
101 102
        @start_sha = @merge_request_diff.head_commit_sha
        @start_version = @merge_request_diff
103
      end
104 105
    end

D
Douwe Maan 已提交
106
    @environment = @merge_request.environments_for(current_user).last
107

108
    respond_to do |format|
109
      format.html { define_discussion_vars }
110
      format.json do
111 112
        if @start_sha
          compared_diff_version
113
        else
114
          original_diff_version
115
        end
116 117 118

        render json: { html: view_to_html_string("projects/merge_requests/show/_diffs") }
      end
119
    end
D
Dmitriy Zaporozhets 已提交
120 121
  end

S
Sean McGivern 已提交
122 123 124 125 126 127 128 129 130 131
  # 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
132
      @grouped_diff_discussions = {}
S
Sean McGivern 已提交
133 134 135 136
    end

    define_commit_vars

137
    render_diff_for_path(@merge_request.diffs(diff_options))
S
Sean McGivern 已提交
138 139
  end

140
  def commits
141
    respond_to do |format|
142 143 144 145 146
      format.html do
        define_discussion_vars

        render 'show'
      end
147 148 149 150 151 152 153 154 155
      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
156
    end
157 158
  end

159 160
  def conflicts
    respond_to do |format|
161
      format.html { define_discussion_vars }
S
Sean McGivern 已提交
162

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

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

191
  def resolve_conflicts
192 193 194 195 196 197 198
    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

199
    begin
200
      MergeRequests::ResolveService.new(@merge_request.source_project, current_user, params).execute(@merge_request)
201

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

204
      render json: { redirect_to: namespace_project_merge_request_url(@project.namespace, @project, @merge_request, resolved_conflicts: true) }
205
    rescue Gitlab::Conflict::ResolutionError => e
206 207
      render status: :bad_request, json: { message: e.message }
    end
208 209
  end

210
  def pipelines
211
    @pipelines = @merge_request.all_pipelines
212

213 214 215 216 217 218
    respond_to do |format|
      format.html do
        define_discussion_vars

        render 'show'
      end
219 220

      format.json do
221 222 223
        render json: PipelineSerializer
          .new(project: @project, user: @current_user)
          .represent(@pipelines)
224
      end
225 226 227
    end
  end

D
Dmitriy Zaporozhets 已提交
228
  def new
229 230 231 232 233 234 235 236
    respond_to do |format|
      format.html { define_new_vars }
      format.json do
        render json: { pipelines: PipelineSerializer
          .new(project: @project, user: @current_user)
          .represent(@pipelines) }
      end
    end
237
  end
D
Douwe Maan 已提交
238

239 240 241 242 243 244 245 246 247 248 249 250 251 252
  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

D
Douwe Maan 已提交
253
        @environment = @merge_request.environments_for(current_user).last
254 255

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

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

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

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

282
    if @merge_request.valid?
283 284
      respond_to do |format|
        format.html do
V
Vinnie Okada 已提交
285
          redirect_to([@merge_request.target_project.namespace.becomes(Namespace),
286
                       @merge_request.target_project, @merge_request])
287
        end
288
        format.json do
289
          render json: @merge_request.to_json(include: { milestone: {}, assignee: { methods: :avatar_url }, labels: { methods: :text_color } }, methods: [:task_status, :task_status_short])
290
        end
291
      end
292
    else
293
      render "edit"
D
Dmitriy Zaporozhets 已提交
294
    end
295 296 297
  rescue ActiveRecord::StaleObjectError
    @conflict = true
    render :edit
D
Dmitriy Zaporozhets 已提交
298 299
  end

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

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

307
  def merge_check
308
    @merge_request.check_if_can_be_merged
309

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

Z
Zeger-Jan van de Weg 已提交
313
  def cancel_merge_when_build_succeeds
314 315 316
    unless @merge_request.can_cancel_merge_when_build_succeeds?(current_user)
      return access_denied!
    end
Z
Zeger-Jan van de Weg 已提交
317

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

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

326 327 328
    # 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 已提交
329 330 331 332
      @status = :failed
      return
    end

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

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

340
    if params[:merge_when_build_succeeds].present?
341
      unless @merge_request.head_pipeline
342 343 344 345
        @status = :failed
        return
      end

346
      if @merge_request.head_pipeline.active?
347 348 349
        MergeRequests::MergeWhenPipelineSucceedsService
          .new(@project, current_user, merge_params)
          .execute(@merge_request)
350

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

366
  def merge_widget_refresh
J
Jarka Kadlecova 已提交
367
    if merge_request.in_progress_merge_commit_sha || merge_request.state == 'merged'
368 369 370 371 372 373 374 375
      @status = :success
    elsif merge_request.merge_when_build_succeeds
      @status = :merge_when_build_succeeds
    end

    render 'merge'
  end

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

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

P
Phil Hughes 已提交
385
    render layout: false
386 387 388
  end

  def branch_to
I
Izaak Alpert 已提交
389
    @target_project = selected_target_project
390 391 392 393 394 395

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

P
Phil Hughes 已提交
396
    render layout: false
397 398
  end

I
Izaak Alpert 已提交
399 400
  def update_branches
    @target_project = selected_target_project
I
Izaak Alpert 已提交
401
    @target_branches = @target_project.repository.branch_names
402

P
Phil Hughes 已提交
403
    render layout: false
I
Izaak Alpert 已提交
404 405
  end

406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424
  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

425
  def ci_status
426 427
    pipeline = @merge_request.head_pipeline

428 429 430
    if pipeline
      status = pipeline.status
      coverage = pipeline.try(:coverage)
431

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

434
      status ||= "preparing"
435
    else
436
      ci_service = @merge_request.source_project.try(:ci_service)
437
      status = ci_service.commit_status(merge_request.diff_head_sha, merge_request.source_branch) if ci_service
438 439
    end

440 441
    response = {
      title: merge_request.title,
442
      sha: (merge_request.diff_head_commit.short_id if merge_request.diff_head_sha),
443
      status: status,
444 445
      coverage: coverage,
      pipeline: pipeline.try(:id)
446 447 448 449 450 451
    }

    render json: response
  end

  def ci_environments_status
Z
Z.J. van de Weg 已提交
452
    environments =
Z
Z.J. van de Weg 已提交
453
      begin
D
Douwe Maan 已提交
454
        @merge_request.environments_for(current_user).map do |environment|
Z
Z.J. van de Weg 已提交
455
          project = environment.project
Z
Z.J. van de Weg 已提交
456 457
          deployment = environment.first_deployment_for(@merge_request.diff_head_commit)

K
Kamil Trzcinski 已提交
458
          stop_url =
K
Kamil Trzcinski 已提交
459
            if environment.stop_action? && can?(current_user, :create_deployment, environment)
K
Kamil Trzcinski 已提交
460 461 462
              stop_namespace_project_environment_path(project.namespace, project, environment)
            end

Z
Z.J. van de Weg 已提交
463
          {
Z
Z.J. van de Weg 已提交
464
            id: environment.id,
Z
Z.J. van de Weg 已提交
465
            name: environment.name,
Z
Z.J. van de Weg 已提交
466
            url: namespace_project_environment_path(project.namespace, project, environment),
K
Kamil Trzcinski 已提交
467
            stop_url: stop_url,
Z
Z.J. van de Weg 已提交
468
            external_url: environment.external_url,
Z
Z.J. van de Weg 已提交
469 470 471
            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 已提交
472 473
          }
        end.compact
474
      end
475

Z
Z.J. van de Weg 已提交
476
    render json: environments
477 478
  end

D
Dmitriy Zaporozhets 已提交
479 480
  protected

I
Izaak Alpert 已提交
481
  def selected_target_project
482 483 484 485 486
    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 已提交
487 488
  end

D
Dmitriy Zaporozhets 已提交
489
  def merge_request
490
    @issuable = @merge_request ||= @project.merge_requests.find_by!(iid: params[:id])
D
Dmitriy Zaporozhets 已提交
491
  end
492
  alias_method :subscribable_resource, :merge_request
493
  alias_method :issuable, :merge_request
494
  alias_method :awardable, :merge_request
D
Dmitriy Zaporozhets 已提交
495

D
Dmitriy Zaporozhets 已提交
496
  def authorize_update_merge_request!
497
    return render_404 unless can?(current_user, :update_merge_request, @merge_request)
D
Dmitriy Zaporozhets 已提交
498 499 500
  end

  def authorize_admin_merge_request!
501
    return render_404 unless can?(current_user, :admin_merge_request, @merge_request)
D
Dmitriy Zaporozhets 已提交
502
  end
503

504 505 506 507
  def authorize_can_resolve_conflicts!
    return render_404 unless @merge_request.conflicts_can_be_resolved_by?(current_user)
  end

508
  def module_enabled
F
Felipe Artur 已提交
509
    return render_404 unless @project.feature_available?(:merge_requests, current_user)
510
  end
511 512

  def validates_merge_request
513 514
    # Show git not found page
    # if there is no saved commits between source & target branch
515
    if @merge_request.has_no_commits?
516 517
      # and if target branch doesn't exist
      return invalid_mr unless @merge_request.target_branch_exists?
518
    end
519 520 521
  end

  def define_show_vars
522
    @noteable = @merge_request
523
    @commits_count = @merge_request.commits_count
524 525 526 527 528

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

530
    labels
531
    define_pipelines_vars
532 533
  end

534 535 536
  # 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
537
    # Build a note object for comment form
538
    @note = @project.notes.new(noteable: @merge_request)
539

540
    @discussions = @merge_request.discussions
541

542 543
    preload_noteable_for_regular_notes(@discussions.flat_map(&:notes))

544
    # This is not executed lazily
545
    @notes = Banzai::NoteRenderer.render(
546
      @discussions.flat_map(&:notes),
547 548 549 550 551 552
      @project,
      current_user,
      @path,
      @project_wiki,
      @ref
    )
553

S
Stan Hu 已提交
554
    preload_max_access_for_authors(@notes, @project)
555 556
  end

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

S
Sean McGivern 已提交
561 562 563 564 565 566 567 568 569 570 571
  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
    }

572
    @use_legacy_diff_notes = !@merge_request.has_complete_diff_refs?
D
Douwe Maan 已提交
573
    @grouped_diff_discussions = @merge_request.notes.inc_relations_for_view.grouped_diff_discussions
S
Sean McGivern 已提交
574 575

    Banzai::NoteRenderer.render(
576
      @grouped_diff_discussions.values.flat_map(&:notes),
S
Sean McGivern 已提交
577 578 579 580 581 582 583 584
      @project,
      current_user,
      @path,
      @project_wiki,
      @ref
    )
  end

585 586
  def define_pipelines_vars
    @pipelines = @merge_request.all_pipelines
587
    @pipeline = @merge_request.head_pipeline
588
    @statuses_count = @pipeline.present? ? @pipeline.statuses.relevant.count : 0
589 590
  end

591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607
  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
608

609 610
    @labels = LabelsFinder.new(current_user, project_id: @project.id).execute

611
    define_pipelines_vars
612 613
  end

614
  def invalid_mr
615
    # Render special view for MR with removed target branch
616 617 618
    render 'invalid'
  end

619
  def merge_request_params
620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640
    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: []
    ]
641
  end
642

Z
Zeger-Jan van de Weg 已提交
643 644 645 646
  def merge_params
    params.permit(:should_remove_source_branch, :commit_message)
  end

647 648 649 650 651
  # 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
652 653 654

  def merge_when_build_succeeds_active?
    params[:merge_when_build_succeeds].present? &&
655
      @merge_request.head_pipeline && @merge_request.head_pipeline.active?
656
  end
S
Sean McGivern 已提交
657 658 659

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

663
  def compared_diff_version
664 665
    @diff_notes_disabled = true
    @diffs = @merge_request_diff.compare_with(@start_sha).diffs(diff_options)
666
  end
667 668

  def original_diff_version
669
    @diff_notes_disabled = !@merge_request_diff.latest?
670 671
    @diffs = @merge_request_diff.diffs(diff_options)
  end
672 673 674 675 676 677

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