merge_requests_controller.rb 15.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: [
12
    :edit, :update, :show, :diffs, :commits, :conflicts, :builds, :merge, :merge_check,
S
Sean McGivern 已提交
13
    :ci_status, :toggle_subscription, :cancel_merge_when_build_succeeds, :remove_wip, :resolve_conflicts
14
  ]
D
Douwe Maan 已提交
15
  before_action :validates_merge_request, only: [:show, :diffs, :commits, :builds]
16
  before_action :define_show_vars, only: [:show, :diffs, :commits, :conflicts, :builds]
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]
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
    terms = params['issue_search']
35
    @merge_requests = merge_requests_collection
36 37 38 39 40 41 42 43

    if terms.present?
      if terms =~ /\A[#!](\d+)\z/
        @merge_requests = @merge_requests.where(iid: $1)
      else
        @merge_requests = @merge_requests.full_search(terms)
      end
    end
44

45
    @merge_requests = @merge_requests.page(params[:page])
46
    @merge_requests = @merge_requests.preload(:target_project)
47

48
    @labels = @project.labels.where(title: params[:label_name])
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 66 67 68
      format.json do
        render json: @merge_request
      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 = @merge_request.merge_request_diff

88
    respond_to do |format|
89
      format.html { define_discussion_vars }
90
      format.json do
91
        @diffs = @merge_request.diffs(diff_options)
92 93 94

        render json: { html: view_to_html_string("projects/merge_requests/show/_diffs") }
      end
95
    end
D
Dmitriy Zaporozhets 已提交
96 97
  end

S
Sean McGivern 已提交
98 99 100 101 102 103 104 105 106 107
  # 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
108
      @grouped_diff_discussions = {}
S
Sean McGivern 已提交
109 110 111 112
    end

    define_commit_vars

113
    render_diff_for_path(@merge_request.diffs(diff_options))
S
Sean McGivern 已提交
114 115
  end

116
  def commits
117
    respond_to do |format|
118 119 120 121 122
      format.html do
        define_discussion_vars

        render 'show'
      end
123 124 125 126 127 128 129 130 131
      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
132
    end
133 134
  end

135 136
  def conflicts
    respond_to do |format|
137
      format.html { define_discussion_vars }
S
Sean McGivern 已提交
138

139
      format.json do
140
        if @merge_request.conflicts_can_be_resolved_in_ui?
141
          render json: @merge_request.conflicts
142 143 144 145 146
        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'
          }
147
        else
148
          render json: {
149
            message: 'The merge conflicts for this merge request cannot be resolved through GitLab. Please try to resolve them locally.',
150 151
            type: 'error'
          }
152 153
        end
      end
154 155 156
    end
  end

157
  def resolve_conflicts
158 159 160 161 162 163 164
    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

165
    begin
166
      MergeRequests::ResolveService.new(@merge_request.source_project, current_user, params).execute(@merge_request)
167

168 169 170
      flash[:conflicts_message] = 'Merge conflicts resolved.'
      flash.keep

171
      render json: { redirect_to: namespace_project_merge_request_url(@project.namespace, @project, @merge_request, resolved_conflicts: true) }
172 173 174
    rescue Gitlab::Conflict::File::MissingResolution => e
      render status: :bad_request, json: { message: e.message }
    end
175 176
  end

D
Douwe Maan 已提交
177 178
  def builds
    respond_to do |format|
179 180 181 182 183
      format.html do
        define_discussion_vars

        render 'show'
      end
D
Douwe Maan 已提交
184 185 186 187
      format.json { render json: { html: view_to_html_string('projects/merge_requests/show/_builds') } }
    end
  end

D
Dmitriy Zaporozhets 已提交
188
  def new
S
Sean McGivern 已提交
189
    build_merge_request
190
    @noteable = @merge_request
D
Dmitriy Zaporozhets 已提交
191 192 193 194 195 196 197 198 199

    @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 已提交
200
    @commits = @merge_request.compare_commits.reverse
201
    @commit = @merge_request.diff_head_commit
202
    @base_commit = @merge_request.diff_base_commit
203
    @diffs = @merge_request.diffs(diff_options) if @merge_request.compare
204
    @diff_notes_disabled = true
D
Douwe Maan 已提交
205

206
    @pipeline = @merge_request.pipeline
207
    @statuses = @pipeline.statuses.relevant if @pipeline
D
Douwe Maan 已提交
208

D
Dmitriy Zaporozhets 已提交
209 210
    @note_counts = Note.where(commit_id: @commits.map(&:id)).
      group(:commit_id).count
D
Dmitriy Zaporozhets 已提交
211 212 213
  end

  def create
I
Izaak Alpert 已提交
214
    @target_branches ||= []
215
    @merge_request = MergeRequests::CreateService.new(project, current_user, merge_request_params).execute
216 217

    if @merge_request.valid?
218
      redirect_to(merge_request_path(@merge_request))
219
    else
I
Izaak Alpert 已提交
220 221 222
      @source_project = @merge_request.source_project
      @target_project = @merge_request.target_project
      render action: "new"
D
Dmitriy Zaporozhets 已提交
223 224 225
    end
  end

D
Douwe Maan 已提交
226 227 228 229 230 231
  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 已提交
232
  def update
233
    @merge_request = MergeRequests::UpdateService.new(project, current_user, merge_request_params).execute(@merge_request)
234

235
    if @merge_request.valid?
236 237
      respond_to do |format|
        format.html do
V
Vinnie Okada 已提交
238
          redirect_to([@merge_request.target_project.namespace.becomes(Namespace),
239
                       @merge_request.target_project, @merge_request])
240
        end
241
        format.json do
242
          render json: @merge_request.to_json(include: { milestone: {}, assignee: { methods: :avatar_url }, labels: { methods: :text_color } })
243
        end
244
      end
245
    else
246
      render "edit"
D
Dmitriy Zaporozhets 已提交
247 248 249
    end
  end

250 251 252 253 254 255 256
  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

257
  def merge_check
258
    @merge_request.check_if_can_be_merged
259

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

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

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

269
  def merge
270
    return access_denied! unless @merge_request.can_be_merged_by?(current_user)
271

272 273 274
    # 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 已提交
275 276 277 278
      @status = :failed
      return
    end

279
    if params[:sha] != @merge_request.diff_head_sha
280 281 282 283
      @status = :sha_mismatch
      return
    end

284
    TodoService.new.merge_merge_request(merge_request, current_user)
285

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

288 289 290 291 292 293 294
    if params[:merge_when_build_succeeds].present?
      unless @merge_request.pipeline
        @status = :failed
        return
      end

      if @merge_request.pipeline.active?
295 296 297
        MergeRequests::MergeWhenBuildSucceedsService.new(@project, current_user, merge_params)
                                                        .execute(@merge_request)
        @status = :merge_when_build_succeeds
Z
Z.J. van de Weg 已提交
298 299 300
      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
301 302 303 304 305
        MergeWorker.perform_async(@merge_request.id, current_user.id, params)
        @status = :success
      else
        @status = :failed
      end
306
    else
Z
Zeger-Jan van de Weg 已提交
307 308
      MergeWorker.perform_async(@merge_request.id, current_user.id, params)
      @status = :success
309
    end
R
randx 已提交
310 311
  end

312
  def branch_from
F
Felipe Artur 已提交
313
    # This is always source
I
Izaak Alpert 已提交
314
    @source_project = @merge_request.nil? ? @project : @merge_request.source_project
315
    @commit = @repository.commit(params[:ref]) if params[:ref].present?
P
Phil Hughes 已提交
316
    render layout: false
317 318 319
  end

  def branch_to
I
Izaak Alpert 已提交
320
    @target_project = selected_target_project
321
    @commit = @target_project.commit(params[:ref]) if params[:ref].present?
P
Phil Hughes 已提交
322
    render layout: false
323 324
  end

I
Izaak Alpert 已提交
325 326
  def update_branches
    @target_project = selected_target_project
I
Izaak Alpert 已提交
327
    @target_branches = @target_project.repository.branch_names
328

P
Phil Hughes 已提交
329
    render layout: false
I
Izaak Alpert 已提交
330 331
  end

332
  def ci_status
333 334 335 336
    pipeline = @merge_request.pipeline
    if pipeline
      status = pipeline.status
      coverage = pipeline.try(:coverage)
337

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

340
      status ||= "preparing"
341 342
    else
      ci_service = @merge_request.source_project.ci_service
343
      status = ci_service.commit_status(merge_request.diff_head_sha, merge_request.source_branch) if ci_service
344

345
      if ci_service.respond_to?(:commit_coverage)
346
        coverage = ci_service.commit_coverage(merge_request.diff_head_sha, merge_request.source_branch)
347
      end
348 349 350
    end

    response = {
351
      title: merge_request.title,
352
      sha: merge_request.diff_head_commit.short_id,
353 354 355
      status: status,
      coverage: coverage
    }
356 357 358 359

    render json: response
  end

D
Dmitriy Zaporozhets 已提交
360 361
  protected

I
Izaak Alpert 已提交
362
  def selected_target_project
363 364 365 366 367
    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 已提交
368 369
  end

D
Dmitriy Zaporozhets 已提交
370
  def merge_request
S
skv 已提交
371
    @merge_request ||= @project.merge_requests.find_by!(iid: params[:id])
D
Dmitriy Zaporozhets 已提交
372
  end
373
  alias_method :subscribable_resource, :merge_request
374
  alias_method :issuable, :merge_request
375
  alias_method :awardable, :merge_request
D
Dmitriy Zaporozhets 已提交
376

D
Dmitriy Zaporozhets 已提交
377
  def authorize_update_merge_request!
378
    return render_404 unless can?(current_user, :update_merge_request, @merge_request)
D
Dmitriy Zaporozhets 已提交
379 380 381
  end

  def authorize_admin_merge_request!
382
    return render_404 unless can?(current_user, :admin_merge_request, @merge_request)
D
Dmitriy Zaporozhets 已提交
383
  end
384

385 386 387 388
  def authorize_can_resolve_conflicts!
    return render_404 unless @merge_request.conflicts_can_be_resolved_by?(current_user)
  end

389 390 391
  def module_enabled
    return render_404 unless @project.merge_requests_enabled
  end
392 393

  def validates_merge_request
394 395 396
    # If source project was removed (Ex. mr from fork to origin)
    return invalid_mr unless @merge_request.source_project

397 398 399
    # Show git not found page
    # if there is no saved commits between source & target branch
    if @merge_request.commits.blank?
400 401
      # and if target branch doesn't exist
      return invalid_mr unless @merge_request.target_branch_exists?
402

403 404
      # or if source branch doesn't exist
      return invalid_mr unless @merge_request.source_branch_exists?
405
    end
406 407 408
  end

  def define_show_vars
409 410 411 412
    @noteable = @merge_request
    @commits_count = @merge_request.commits.count

    @pipeline = @merge_request.pipeline
413
    @statuses = @pipeline.statuses.relevant if @pipeline
414 415 416 417 418 419 420

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

421 422 423
  # 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
424
    # Build a note object for comment form
425
    @note = @project.notes.new(noteable: @noteable)
426

427
    @discussions = @noteable.mr_and_commit_notes.
428 429 430 431
      inc_author_project_award_emoji.
      fresh.
      discussions

432 433
    preload_noteable_for_regular_notes(@discussions.flat_map(&:notes))

434
    # This is not executed lazily
435
    @notes = Banzai::NoteRenderer.render(
436
      @discussions.flat_map(&:notes),
437 438 439 440 441 442
      @project,
      current_user,
      @path,
      @project_wiki,
      @ref
    )
443

S
Stan Hu 已提交
444
    preload_max_access_for_authors(@notes, @project)
445 446
  end

447
  def define_widget_vars
448 449
    @pipeline = @merge_request.pipeline
    @pipelines = [@pipeline].compact
450 451
  end

S
Sean McGivern 已提交
452 453 454 455 456 457 458 459 460 461 462
  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
    }

463
    @use_legacy_diff_notes = !@merge_request.has_complete_diff_refs?
464
    @grouped_diff_discussions = @merge_request.notes.inc_author_project_award_emoji.grouped_diff_discussions
S
Sean McGivern 已提交
465 466

    Banzai::NoteRenderer.render(
467
      @grouped_diff_discussions.values.flat_map(&:notes),
S
Sean McGivern 已提交
468 469 470 471 472 473 474 475
      @project,
      current_user,
      @path,
      @project_wiki,
      @ref
    )
  end

476 477 478 479 480
  def invalid_mr
    # Render special view for MR with removed source or target branch
    render 'invalid'
  end

481
  def merge_request_params
482
    params.require(:merge_request).permit(
483 484
      :title, :assignee_id, :source_project_id, :source_branch,
      :target_project_id, :target_branch, :milestone_id,
485
      :state_event, :description, :task_num, :force_remove_source_branch,
486
      label_ids: []
487 488
    )
  end
489

Z
Zeger-Jan van de Weg 已提交
490 491 492 493
  def merge_params
    params.permit(:should_remove_source_branch, :commit_message)
  end

494 495 496 497 498
  # 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
499 500 501 502 503

  def merge_when_build_succeeds_active?
    params[:merge_when_build_succeeds].present? &&
      @merge_request.pipeline && @merge_request.pipeline.active?
  end
S
Sean McGivern 已提交
504 505 506 507 508

  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
D
Dmitriy Zaporozhets 已提交
509
end