merge_requests_controller.rb 16.2 KB
Newer Older
1
class Projects::MergeRequestsController < Projects::ApplicationController
2
  include ToggleSubscriptionAction
3
  include DiffForPath
4
  include DiffHelper
5
  include IssuableActions
6
  include NotesHelper
7
  include ToggleAwardEmoji
8
  include IssuableCollections
9

10
  before_action :module_enabled
11
  before_action :merge_request, only: [
Douwe Maan's avatar
Douwe Maan committed
12
    :edit, :update, :show, :diffs, :commits, :conflicts, :builds, :pipelines, :merge, :merge_check,
Sean McGivern's avatar
Sean McGivern committed
13
    :ci_status, :toggle_subscription, :cancel_merge_when_build_succeeds, :remove_wip, :resolve_conflicts
14
  ]
15
  before_action :validates_merge_request, only: [:show, :diffs, :commits, :builds, :pipelines]
Douwe Maan's avatar
Douwe Maan committed
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]
18 19
  before_action :define_commit_vars, only: [:diffs]
  before_action :define_diff_comment_vars, only: [:diffs]
Douwe Maan's avatar
Douwe Maan committed
20
  before_action :ensure_ref_fetched, only: [:show, :diffs, :commits, :builds, :conflicts, :pipelines]
21
  before_action :close_merge_request_without_source_project, only: [:show]
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
22 23

  # Allow read any merge_request
24
  before_action :authorize_read_merge_request!
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
25 26

  # Allow write(create) merge_request
27
  before_action :authorize_create_merge_request!, only: [:new, :create]
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
28 29

  # Allow modify merge_request
30
  before_action :authorize_update_merge_request!, only: [:close, :edit, :update, :remove_wip, :sort]
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
31

32 33
  before_action :authorize_can_resolve_conflicts!, only: [:conflicts, :resolve_conflicts]

Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
34
  def index
35
    @merge_requests = merge_requests_collection
36
    @merge_requests = @merge_requests.page(params[:page])
37
    @merge_requests = @merge_requests.preload(:target_project)
38

39
    @labels = @project.labels.where(title: params[:label_name])
Tap's avatar
Tap committed
40

41 42 43 44
    respond_to do |format|
      format.html
      format.json do
        render json: {
45
          html: view_to_html_string("projects/merge_requests/_merge_requests"),
46
          labels: @labels.as_json(methods: :text_color)
47 48 49
        }
      end
    end
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
50 51 52
  end

  def show
53
    respond_to do |format|
54
      format.html { define_discussion_vars }
55

Douwe Maan's avatar
Douwe Maan committed
56 57 58 59
      format.json do
        render json: @merge_request
      end

60
      format.patch  do
Douwe Maan's avatar
Douwe Maan committed
61 62 63
        return render_404 unless @merge_request.diff_refs

        send_git_patch @project.repository, @merge_request.diff_refs
64
      end
Douwe Maan's avatar
Douwe Maan committed
65

66
      format.diff do
Douwe Maan's avatar
Douwe Maan committed
67
        return render_404 unless @merge_request.diff_refs
68

Douwe Maan's avatar
Douwe Maan committed
69
        send_git_diff @project.repository, @merge_request.diff_refs
70
      end
71
    end
randx's avatar
randx committed
72 73
  end

74
  def diffs
75 76
    apply_diff_view_cookie!

77 78 79 80 81 82
    @merge_request_diff =
      if params[:diff_id]
        @merge_request.merge_request_diffs.find(params[:diff_id])
      else
        @merge_request.merge_request_diff
      end
83

84 85 86 87 88
    @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]
89 90 91 92 93
      @start_version = @comparable_diffs.find { |diff| diff.head_commit_sha == @start_sha }

      unless @start_version
        render_404
      end
94 95
    end

96
    respond_to do |format|
97
      format.html { define_discussion_vars }
98
      format.json do
99 100
        if @start_sha
          compared_diff_version
101
        else
102
          original_diff_version
103
        end
104 105 106

        render json: { html: view_to_html_string("projects/merge_requests/show/_diffs") }
      end
107
    end
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
108 109
  end

110 111 112 113 114 115 116 117 118 119
  # 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
120
      @grouped_diff_discussions = {}
121 122 123 124
    end

    define_commit_vars

125
    render_diff_for_path(@merge_request.diffs(diff_options))
126 127
  end

128
  def commits
129
    respond_to do |format|
130 131 132 133 134
      format.html do
        define_discussion_vars

        render 'show'
      end
135 136 137 138 139 140 141 142 143
      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
144
    end
145 146
  end

147 148
  def conflicts
    respond_to do |format|
149
      format.html { define_discussion_vars }
150

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

169
  def resolve_conflicts
170 171 172 173 174 175 176
    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

177
    begin
178
      MergeRequests::ResolveService.new(@merge_request.source_project, current_user, params).execute(@merge_request)
179

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

182
      render json: { redirect_to: namespace_project_merge_request_url(@project.namespace, @project, @merge_request, resolved_conflicts: true) }
183 184 185
    rescue Gitlab::Conflict::File::MissingResolution => e
      render status: :bad_request, json: { message: e.message }
    end
186 187
  end

188 189
  def builds
    respond_to do |format|
190 191 192 193 194
      format.html do
        define_discussion_vars

        render 'show'
      end
195 196 197 198
      format.json { render json: { html: view_to_html_string('projects/merge_requests/show/_builds') } }
    end
  end

199
  def pipelines
200
    @pipelines = @merge_request.all_pipelines
201

202 203 204 205 206 207 208 209 210 211
    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

Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
212
  def new
213 214
    apply_diff_view_cookie!

215
    build_merge_request
216
    @noteable = @merge_request
217 218 219 220 221 222 223 224 225

    @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
226
    @commits = @merge_request.compare_commits.reverse
227
    @commit = @merge_request.diff_head_commit
228
    @base_commit = @merge_request.diff_base_commit
229
    @diffs = @merge_request.diffs(diff_options) if @merge_request.compare
230
    @diff_notes_disabled = true
231
    @pipeline = @merge_request.pipeline
232
    @statuses = @pipeline.statuses.relevant if @pipeline
233

234 235
    @note_counts = Note.where(commit_id: @commits.map(&:id)).
      group(:commit_id).count
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
236 237 238
  end

  def create
239
    @target_branches ||= []
240
    @merge_request = MergeRequests::CreateService.new(project, current_user, merge_request_params).execute
241 242

    if @merge_request.valid?
243
      redirect_to(merge_request_path(@merge_request))
244
    else
Izaak Alpert's avatar
Izaak Alpert committed
245 246 247
      @source_project = @merge_request.source_project
      @target_project = @merge_request.target_project
      render action: "new"
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
248 249 250
    end
  end

251 252 253 254 255 256
  def edit
    @source_project = @merge_request.source_project
    @target_project = @merge_request.target_project
    @target_branches = @merge_request.target_project.repository.branch_names
  end

Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
257
  def update
258
    @merge_request = MergeRequests::UpdateService.new(project, current_user, merge_request_params).execute(@merge_request)
259

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

278 279 280 281 282 283 284
  def remove_wip
    MergeRequests::UpdateService.new(project, current_user, title: @merge_request.wipless_title).execute(@merge_request)

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

285
  def merge_check
286
    @merge_request.check_if_can_be_merged
287

Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
288
    render partial: "projects/merge_requests/widget/show.html.haml", layout: false
Valery Sizov's avatar
Valery Sizov committed
289 290
  end

291
  def cancel_merge_when_build_succeeds
292
    return access_denied! unless @merge_request.can_cancel_merge_when_build_succeeds?(current_user)
293

294
    MergeRequests::MergeWhenBuildSucceedsService.new(@project, current_user).cancel(@merge_request)
295 296
  end

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

300 301 302
    # 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?)
303 304 305 306
      @status = :failed
      return
    end

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

312 313
    @merge_request.update(merge_error: nil)

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

      if @merge_request.pipeline.active?
321 322 323
        MergeRequests::MergeWhenBuildSucceedsService.new(@project, current_user, merge_params)
                                                        .execute(@merge_request)
        @status = :merge_when_build_succeeds
324 325 326
      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
327 328 329 330 331
        MergeWorker.perform_async(@merge_request.id, current_user.id, params)
        @status = :success
      else
        @status = :failed
      end
332
    else
333 334
      MergeWorker.perform_async(@merge_request.id, current_user.id, params)
      @status = :success
335
    end
randx's avatar
randx committed
336 337
  end

338
  def branch_from
339
    # This is always source
Izaak Alpert's avatar
Izaak Alpert committed
340
    @source_project = @merge_request.nil? ? @project : @merge_request.source_project
341
    @commit = @repository.commit(params[:ref]) if params[:ref].present?
342
    render layout: false
343 344 345
  end

  def branch_to
346
    @target_project = selected_target_project
347
    @commit = @target_project.commit(params[:ref]) if params[:ref].present?
348
    render layout: false
349 350
  end

351 352
  def update_branches
    @target_project = selected_target_project
Izaak Alpert's avatar
Izaak Alpert committed
353
    @target_branches = @target_project.repository.branch_names
354

Phil Hughes's avatar
Phil Hughes committed
355
    render layout: false
356 357
  end

358
  def ci_status
359 360 361 362
    pipeline = @merge_request.pipeline
    if pipeline
      status = pipeline.status
      coverage = pipeline.try(:coverage)
363

Connor Shea's avatar
Connor Shea committed
364
      status = "success_with_warnings" if pipeline.success? && pipeline.has_warnings?
365

366
      status ||= "preparing"
367 368
    else
      ci_service = @merge_request.source_project.ci_service
369
      status = ci_service.commit_status(merge_request.diff_head_sha, merge_request.source_branch) if ci_service
370

371
      if ci_service.respond_to?(:commit_coverage)
372
        coverage = ci_service.commit_coverage(merge_request.diff_head_sha, merge_request.source_branch)
373
      end
374 375 376
    end

    response = {
377
      title: merge_request.title,
378
      sha: merge_request.diff_head_commit.short_id,
379 380 381
      status: status,
      coverage: coverage
    }
382 383 384 385

    render json: response
  end

Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
386 387
  protected

388
  def selected_target_project
389 390 391 392 393
    if @project.id.to_s == params[:target_project_id] || @project.forked_project_link.nil?
      @project
    else
      @project.forked_project_link.forked_from_project
    end
394 395
  end

Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
396
  def merge_request
397
    @issuable = @merge_request ||= @project.merge_requests.find_by!(iid: params[:id])
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
398
  end
399
  alias_method :subscribable_resource, :merge_request
400
  alias_method :issuable, :merge_request
401
  alias_method :awardable, :merge_request
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
402

403
  def authorize_update_merge_request!
404
    return render_404 unless can?(current_user, :update_merge_request, @merge_request)
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
405 406 407
  end

  def authorize_admin_merge_request!
408
    return render_404 unless can?(current_user, :admin_merge_request, @merge_request)
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
409
  end
410

411 412 413 414
  def authorize_can_resolve_conflicts!
    return render_404 unless @merge_request.conflicts_can_be_resolved_by?(current_user)
  end

415
  def module_enabled
416
    return render_404 unless @project.feature_available?(:merge_requests, current_user)
417
  end
418 419

  def validates_merge_request
420 421 422
    # Show git not found page
    # if there is no saved commits between source & target branch
    if @merge_request.commits.blank?
423 424
      # and if target branch doesn't exist
      return invalid_mr unless @merge_request.target_branch_exists?
425
    end
426 427 428
  end

  def define_show_vars
429 430 431 432
    @noteable = @merge_request
    @commits_count = @merge_request.commits.count

    @pipeline = @merge_request.pipeline
433
    @statuses = @pipeline.statuses.relevant if @pipeline
434 435 436 437 438 439 440

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

441 442 443
  # 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
444
    # Build a note object for comment form
445
    @note = @project.notes.new(noteable: @merge_request)
446

447
    @discussions = @merge_request.discussions
448

449 450
    preload_noteable_for_regular_notes(@discussions.flat_map(&:notes))

451
    # This is not executed lazily
452
    @notes = Banzai::NoteRenderer.render(
453
      @discussions.flat_map(&:notes),
454 455 456 457 458 459
      @project,
      current_user,
      @path,
      @project_wiki,
      @ref
    )
460

Stan Hu's avatar
Stan Hu committed
461
    preload_max_access_for_authors(@notes, @project)
462 463
  end

464
  def define_widget_vars
465 466
    @pipeline = @merge_request.pipeline
    @pipelines = [@pipeline].compact
467 468
  end

469 470 471 472 473 474 475 476 477 478 479
  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
    }

480
    @use_legacy_diff_notes = !@merge_request.has_complete_diff_refs?
481
    @grouped_diff_discussions = @merge_request.notes.inc_relations_for_view.grouped_diff_discussions
482 483

    Banzai::NoteRenderer.render(
484
      @grouped_diff_discussions.values.flat_map(&:notes),
485 486 487 488 489 490 491 492
      @project,
      current_user,
      @path,
      @project_wiki,
      @ref
    )
  end

493
  def invalid_mr
494
    # Render special view for MR with removed target branch
495 496 497
    render 'invalid'
  end

498
  def merge_request_params
499
    params.require(:merge_request).permit(
500 501
      :title, :assignee_id, :source_project_id, :source_branch,
      :target_project_id, :target_branch, :milestone_id,
502
      :state_event, :description, :task_num, :force_remove_source_branch,
503
      :lock_version, label_ids: []
504 505
    )
  end
506

507 508 509 510
  def merge_params
    params.permit(:should_remove_source_branch, :commit_message)
  end

511 512 513 514 515
  # 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
516 517 518 519 520

  def merge_when_build_succeeds_active?
    params[:merge_when_build_succeeds].present? &&
      @merge_request.pipeline && @merge_request.pipeline.active?
  end
521 522 523 524 525

  def build_merge_request
    params[:merge_request] ||= ActionController::Parameters.new(source_project: @project)
    @merge_request = MergeRequests::BuildService.new(project, current_user, merge_request_params).execute
  end
526

527
  def compared_diff_version
528 529
    @diff_notes_disabled = true
    @diffs = @merge_request_diff.compare_with(@start_sha).diffs(diff_options)
530
  end
531 532

  def original_diff_version
533
    @diff_notes_disabled = !@merge_request_diff.latest?
534 535
    @diffs = @merge_request_diff.diffs(diff_options)
  end
536 537 538 539 540 541

  def close_merge_request_without_source_project
    if !@merge_request.source_project && @merge_request.open?
      @merge_request.close
    end
  end
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
542
end