merge_requests_controller.rb 16.2 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,
S
Sean McGivern 已提交
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]
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]
D
Dmitriy Zaporozhets 已提交
21 22

  # Allow read any merge_request
23
  before_action :authorize_read_merge_request!
D
Dmitriy Zaporozhets 已提交
24 25

  # Allow write(create) merge_request
D
Dmitriy Zaporozhets 已提交
26
  before_action :authorize_create_merge_request!, only: [:new, :create]
D
Dmitriy Zaporozhets 已提交
27 28

  # Allow modify merge_request
29
  before_action :authorize_update_merge_request!, only: [:close, :edit, :update, :remove_wip, :sort]
D
Dmitriy Zaporozhets 已提交
30

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

D
Dmitriy Zaporozhets 已提交
33
  def index
34
    @merge_requests = merge_requests_collection
35
    @merge_requests = @merge_requests.page(params[:page])
36
    @merge_requests = @merge_requests.preload(:target_project)
37

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

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

  def show
52
    respond_to do |format|
53
      format.html { define_discussion_vars }
S
Sean McGivern 已提交
54

D
Douwe Maan 已提交
55 56 57 58
      format.json do
        render json: @merge_request
      end

Z
Z.J. van de Weg 已提交
59
      format.patch  do
D
Douwe Maan 已提交
60 61 62
        return render_404 unless @merge_request.diff_refs

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

65
      format.diff do
D
Douwe Maan 已提交
66
        return render_404 unless @merge_request.diff_refs
67

D
Douwe Maan 已提交
68
        send_git_diff @project.repository, @merge_request.diff_refs
69
      end
70
    end
R
randx 已提交
71 72
  end

73
  def diffs
74 75
    apply_diff_view_cookie!

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

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

      unless @start_version
        render_404
      end
93 94
    end

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

        render json: { html: view_to_html_string("projects/merge_requests/show/_diffs") }
      end
106
    end
D
Dmitriy Zaporozhets 已提交
107 108
  end

S
Sean McGivern 已提交
109 110 111 112 113 114 115 116 117 118
  # 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
119
      @grouped_diff_discussions = {}
S
Sean McGivern 已提交
120 121 122 123
    end

    define_commit_vars

124
    render_diff_for_path(@merge_request.diffs(diff_options))
S
Sean McGivern 已提交
125 126
  end

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

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

146 147
  def conflicts
    respond_to do |format|
148
      format.html { define_discussion_vars }
S
Sean McGivern 已提交
149

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

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

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

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

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

D
Douwe Maan 已提交
187 188
  def builds
    respond_to do |format|
189 190 191 192 193
      format.html do
        define_discussion_vars

        render 'show'
      end
D
Douwe Maan 已提交
194 195 196 197
      format.json { render json: { html: view_to_html_string('projects/merge_requests/show/_builds') } }
    end
  end

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

201 202 203 204 205 206 207 208 209 210
    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 已提交
211
  def new
212 213
    apply_diff_view_cookie!

S
Sean McGivern 已提交
214
    build_merge_request
215
    @noteable = @merge_request
D
Dmitriy Zaporozhets 已提交
216 217 218 219 220 221 222 223 224

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

D
Dmitriy Zaporozhets 已提交
233 234
    @note_counts = Note.where(commit_id: @commits.map(&:id)).
      group(:commit_id).count
D
Dmitriy Zaporozhets 已提交
235 236 237
  end

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

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

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

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

277 278 279 280 281 282 283
  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

284
  def merge_check
285
    @merge_request.check_if_can_be_merged
286

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

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

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

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

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

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

311
    TodoService.new.merge_merge_request(merge_request, current_user)
312

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
  def ci_status
360 361 362 363
    pipeline = @merge_request.pipeline
    if pipeline
      status = pipeline.status
      coverage = pipeline.try(:coverage)
364

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

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

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

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

    render json: response
  end

D
Dmitriy Zaporozhets 已提交
387 388
  protected

I
Izaak Alpert 已提交
389
  def selected_target_project
390 391 392 393 394
    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 已提交
395 396
  end

D
Dmitriy Zaporozhets 已提交
397
  def merge_request
398
    @issuable = @merge_request ||= @project.merge_requests.find_by!(iid: params[:id])
D
Dmitriy Zaporozhets 已提交
399
  end
400
  alias_method :subscribable_resource, :merge_request
401
  alias_method :issuable, :merge_request
402
  alias_method :awardable, :merge_request
D
Dmitriy Zaporozhets 已提交
403

D
Dmitriy Zaporozhets 已提交
404
  def authorize_update_merge_request!
405
    return render_404 unless can?(current_user, :update_merge_request, @merge_request)
D
Dmitriy Zaporozhets 已提交
406 407 408
  end

  def authorize_admin_merge_request!
409
    return render_404 unless can?(current_user, :admin_merge_request, @merge_request)
D
Dmitriy Zaporozhets 已提交
410
  end
411

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

416
  def module_enabled
F
Felipe Artur 已提交
417
    return render_404 unless @project.feature_available?(:merge_requests, current_user)
418
  end
419 420

  def validates_merge_request
421 422 423 424
    # If source project was removed and merge request for some reason
    # wasn't close (Ex. mr from fork to origin)
    return invalid_mr if !@merge_request.source_project && @merge_request.open?

425 426 427
    # Show git not found page
    # if there is no saved commits between source & target branch
    if @merge_request.commits.blank?
428 429
      # and if target branch doesn't exist
      return invalid_mr unless @merge_request.target_branch_exists?
430
    end
431 432 433
  end

  def define_show_vars
434 435 436 437
    @noteable = @merge_request
    @commits_count = @merge_request.commits.count

    @pipeline = @merge_request.pipeline
438
    @statuses = @pipeline.statuses.relevant if @pipeline
439 440 441 442 443 444 445

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

446 447 448
  # 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
449
    # Build a note object for comment form
450
    @note = @project.notes.new(noteable: @merge_request)
451

452
    @discussions = @merge_request.discussions
453

454 455
    preload_noteable_for_regular_notes(@discussions.flat_map(&:notes))

456
    # This is not executed lazily
457
    @notes = Banzai::NoteRenderer.render(
458
      @discussions.flat_map(&:notes),
459 460 461 462 463 464
      @project,
      current_user,
      @path,
      @project_wiki,
      @ref
    )
465

S
Stan Hu 已提交
466
    preload_max_access_for_authors(@notes, @project)
467 468
  end

469
  def define_widget_vars
470 471
    @pipeline = @merge_request.pipeline
    @pipelines = [@pipeline].compact
472 473
  end

S
Sean McGivern 已提交
474 475 476 477 478 479 480 481 482 483 484
  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
    }

485
    @use_legacy_diff_notes = !@merge_request.has_complete_diff_refs?
D
Douwe Maan 已提交
486
    @grouped_diff_discussions = @merge_request.notes.inc_relations_for_view.grouped_diff_discussions
S
Sean McGivern 已提交
487 488

    Banzai::NoteRenderer.render(
489
      @grouped_diff_discussions.values.flat_map(&:notes),
S
Sean McGivern 已提交
490 491 492 493 494 495 496 497
      @project,
      current_user,
      @path,
      @project_wiki,
      @ref
    )
  end

498 499 500 501 502
  def invalid_mr
    # Render special view for MR with removed source or target branch
    render 'invalid'
  end

503
  def merge_request_params
504
    params.require(:merge_request).permit(
505 506
      :title, :assignee_id, :source_project_id, :source_branch,
      :target_project_id, :target_branch, :milestone_id,
507
      :state_event, :description, :task_num, :force_remove_source_branch,
508
      :lock_version, label_ids: []
509 510
    )
  end
511

Z
Zeger-Jan van de Weg 已提交
512 513 514 515
  def merge_params
    params.permit(:should_remove_source_branch, :commit_message)
  end

516 517 518 519 520
  # 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
521 522 523 524 525

  def merge_when_build_succeeds_active?
    params[:merge_when_build_succeeds].present? &&
      @merge_request.pipeline && @merge_request.pipeline.active?
  end
S
Sean McGivern 已提交
526 527 528 529 530

  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
531

532
  def compared_diff_version
533 534
    @diff_notes_disabled = true
    @diffs = @merge_request_diff.compare_with(@start_sha).diffs(diff_options)
535
  end
536 537

  def original_diff_version
538
    @diff_notes_disabled = !@merge_request_diff.latest?
539 540
    @diffs = @merge_request_diff.diffs(diff_options)
  end
D
Dmitriy Zaporozhets 已提交
541
end