merge_requests_controller.rb 14.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, :builds, :merge, :merge_check,
13
    :ci_status, :toggle_subscription, :cancel_merge_when_build_succeeds, :remove_wip
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

D
Dmitriy Zaporozhets 已提交
31
  def index
32
    terms = params['issue_search']
33
    @merge_requests = merge_requests_collection
34 35 36 37 38 39 40 41

    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
42

43
    @merge_requests = @merge_requests.page(params[:page])
44
    @merge_requests = @merge_requests.preload(:target_project)
45

46
    @labels = @project.labels.where(title: params[:label_name])
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
    @merge_request_diff = @merge_request.merge_request_diff

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

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

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

    define_commit_vars

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

114
  def commits
115
    respond_to do |format|
116 117 118 119 120
      format.html do
        define_discussion_vars

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

133
  def conflicts
134 135
    return render_404 unless @merge_request.cannot_be_merged?

136 137
    respond_to do |format|
      format.html { render 'show' }
138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164
      format.json do
        rugged = @merge_request.project.repository.rugged
        their_commit = rugged.branches[@merge_request.target_branch].target
        our_commit = rugged.lookup(@merge_request.diff_head_sha)
        merge = rugged.merge_commits(our_commit, their_commit)
        commit_message = "Merge branch '#{@merge_request.target_branch}' into '#{@merge_request.source_branch}'\n\n# Conflicts:"

        files = merge.conflicts.map do |conflict|
          their_path = conflict[:theirs][:path]
          our_path = conflict[:ours][:path]

          raise 'path mismatch!' unless their_path == our_path

          commit_message << "\n#   #{our_path}"
          merge_file = merge.merge_file(our_path)

          Gitlab::Conflict::File.new(merge_file, conflict, @merge_request.target_branch, @merge_request.source_branch, @merge_request.project.repository)
        end

        render json: {
          target_branch: @merge_request.target_branch,
          source_branch: @merge_request.source_branch,
          commit_sha: @merge_request.diff_head_sha,
          commit_message: commit_message,
          files: files
        }
      end
165 166 167
    end
  end

D
Douwe Maan 已提交
168 169
  def builds
    respond_to do |format|
170 171 172 173 174
      format.html do
        define_discussion_vars

        render 'show'
      end
D
Douwe Maan 已提交
175 176 177 178
      format.json { render json: { html: view_to_html_string('projects/merge_requests/show/_builds') } }
    end
  end

D
Dmitriy Zaporozhets 已提交
179
  def new
S
Sean McGivern 已提交
180
    build_merge_request
181
    @noteable = @merge_request
D
Dmitriy Zaporozhets 已提交
182 183 184 185 186 187 188 189 190

    @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 已提交
191
    @commits = @merge_request.compare_commits.reverse
192
    @commit = @merge_request.diff_head_commit
193
    @base_commit = @merge_request.diff_base_commit
194
    @diffs = @merge_request.diffs(diff_options) if @merge_request.compare
195
    @diff_notes_disabled = true
D
Douwe Maan 已提交
196

197
    @pipeline = @merge_request.pipeline
198
    @statuses = @pipeline.statuses.relevant if @pipeline
D
Douwe Maan 已提交
199

D
Dmitriy Zaporozhets 已提交
200 201
    @note_counts = Note.where(commit_id: @commits.map(&:id)).
      group(:commit_id).count
D
Dmitriy Zaporozhets 已提交
202 203 204
  end

  def create
I
Izaak Alpert 已提交
205
    @target_branches ||= []
206
    @merge_request = MergeRequests::CreateService.new(project, current_user, merge_request_params).execute
207 208

    if @merge_request.valid?
209
      redirect_to(merge_request_path(@merge_request))
210
    else
I
Izaak Alpert 已提交
211 212 213
      @source_project = @merge_request.source_project
      @target_project = @merge_request.target_project
      render action: "new"
D
Dmitriy Zaporozhets 已提交
214 215 216
    end
  end

D
Douwe Maan 已提交
217 218 219 220 221 222
  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 已提交
223
  def update
224
    @merge_request = MergeRequests::UpdateService.new(project, current_user, merge_request_params).execute(@merge_request)
225

226
    if @merge_request.valid?
227 228
      respond_to do |format|
        format.html do
V
Vinnie Okada 已提交
229
          redirect_to([@merge_request.target_project.namespace.becomes(Namespace),
230
                       @merge_request.target_project, @merge_request])
231
        end
232
        format.json do
233
          render json: @merge_request.to_json(include: { milestone: {}, assignee: { methods: :avatar_url }, labels: { methods: :text_color } })
234
        end
235
      end
236
    else
237
      render "edit"
D
Dmitriy Zaporozhets 已提交
238 239 240
    end
  end

241 242 243 244 245 246 247
  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

248
  def merge_check
249
    @merge_request.check_if_can_be_merged
250

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

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

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

260
  def merge
261
    return access_denied! unless @merge_request.can_be_merged_by?(current_user)
262

263 264 265
    # 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 已提交
266 267 268 269
      @status = :failed
      return
    end

270
    if params[:sha] != @merge_request.diff_head_sha
271 272 273 274
      @status = :sha_mismatch
      return
    end

275
    TodoService.new.merge_merge_request(merge_request, current_user)
276

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

279 280 281 282 283 284 285
    if params[:merge_when_build_succeeds].present?
      unless @merge_request.pipeline
        @status = :failed
        return
      end

      if @merge_request.pipeline.active?
286 287 288
        MergeRequests::MergeWhenBuildSucceedsService.new(@project, current_user, merge_params)
                                                        .execute(@merge_request)
        @status = :merge_when_build_succeeds
Z
Z.J. van de Weg 已提交
289 290 291
      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
292 293 294 295 296
        MergeWorker.perform_async(@merge_request.id, current_user.id, params)
        @status = :success
      else
        @status = :failed
      end
297
    else
Z
Zeger-Jan van de Weg 已提交
298 299
      MergeWorker.perform_async(@merge_request.id, current_user.id, params)
      @status = :success
300
    end
R
randx 已提交
301 302
  end

303
  def branch_from
F
Felipe Artur 已提交
304
    # This is always source
I
Izaak Alpert 已提交
305
    @source_project = @merge_request.nil? ? @project : @merge_request.source_project
306
    @commit = @repository.commit(params[:ref]) if params[:ref].present?
P
Phil Hughes 已提交
307
    render layout: false
308 309 310
  end

  def branch_to
I
Izaak Alpert 已提交
311
    @target_project = selected_target_project
312
    @commit = @target_project.commit(params[:ref]) if params[:ref].present?
P
Phil Hughes 已提交
313
    render layout: false
314 315
  end

I
Izaak Alpert 已提交
316 317
  def update_branches
    @target_project = selected_target_project
I
Izaak Alpert 已提交
318
    @target_branches = @target_project.repository.branch_names
319

P
Phil Hughes 已提交
320
    render layout: false
I
Izaak Alpert 已提交
321 322
  end

323
  def ci_status
324 325 326 327
    pipeline = @merge_request.pipeline
    if pipeline
      status = pipeline.status
      coverage = pipeline.try(:coverage)
328

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

331
      status ||= "preparing"
332 333
    else
      ci_service = @merge_request.source_project.ci_service
334
      status = ci_service.commit_status(merge_request.diff_head_sha, merge_request.source_branch) if ci_service
335

336
      if ci_service.respond_to?(:commit_coverage)
337
        coverage = ci_service.commit_coverage(merge_request.diff_head_sha, merge_request.source_branch)
338
      end
339 340 341
    end

    response = {
342
      title: merge_request.title,
343
      sha: merge_request.diff_head_commit.short_id,
344 345 346
      status: status,
      coverage: coverage
    }
347 348 349 350

    render json: response
  end

D
Dmitriy Zaporozhets 已提交
351 352
  protected

I
Izaak Alpert 已提交
353
  def selected_target_project
354 355 356 357 358
    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 已提交
359 360
  end

D
Dmitriy Zaporozhets 已提交
361
  def merge_request
S
skv 已提交
362
    @merge_request ||= @project.merge_requests.find_by!(iid: params[:id])
D
Dmitriy Zaporozhets 已提交
363
  end
364
  alias_method :subscribable_resource, :merge_request
365
  alias_method :issuable, :merge_request
366
  alias_method :awardable, :merge_request
D
Dmitriy Zaporozhets 已提交
367

D
Dmitriy Zaporozhets 已提交
368
  def authorize_update_merge_request!
369
    return render_404 unless can?(current_user, :update_merge_request, @merge_request)
D
Dmitriy Zaporozhets 已提交
370 371 372
  end

  def authorize_admin_merge_request!
373
    return render_404 unless can?(current_user, :admin_merge_request, @merge_request)
D
Dmitriy Zaporozhets 已提交
374
  end
375 376 377 378

  def module_enabled
    return render_404 unless @project.merge_requests_enabled
  end
379 380

  def validates_merge_request
381 382 383
    # If source project was removed (Ex. mr from fork to origin)
    return invalid_mr unless @merge_request.source_project

384 385 386
    # Show git not found page
    # if there is no saved commits between source & target branch
    if @merge_request.commits.blank?
387 388
      # and if target branch doesn't exist
      return invalid_mr unless @merge_request.target_branch_exists?
389

390 391
      # or if source branch doesn't exist
      return invalid_mr unless @merge_request.source_branch_exists?
392
    end
393 394 395
  end

  def define_show_vars
396 397 398 399
    @noteable = @merge_request
    @commits_count = @merge_request.commits.count

    @pipeline = @merge_request.pipeline
400
    @statuses = @pipeline.statuses.relevant if @pipeline
401 402 403 404 405 406 407

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

408 409 410
  # 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
411
    # Build a note object for comment form
412
    @note = @project.notes.new(noteable: @noteable)
413

414
    @discussions = @noteable.mr_and_commit_notes.
415 416 417 418
      inc_author_project_award_emoji.
      fresh.
      discussions

419 420
    preload_noteable_for_regular_notes(@discussions.flat_map(&:notes))

421
    # This is not executed lazily
422
    @notes = Banzai::NoteRenderer.render(
423
      @discussions.flat_map(&:notes),
424 425 426 427 428 429
      @project,
      current_user,
      @path,
      @project_wiki,
      @ref
    )
430

S
Stan Hu 已提交
431
    preload_max_access_for_authors(@notes, @project)
432 433
  end

434
  def define_widget_vars
435 436
    @pipeline = @merge_request.pipeline
    @pipelines = [@pipeline].compact
437 438
  end

S
Sean McGivern 已提交
439 440 441 442 443 444 445 446 447 448 449 450
  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
    }

    @use_legacy_diff_notes = !@merge_request.support_new_diff_notes?
451
    @grouped_diff_discussions = @merge_request.notes.inc_author_project_award_emoji.grouped_diff_discussions
S
Sean McGivern 已提交
452 453

    Banzai::NoteRenderer.render(
454
      @grouped_diff_discussions.values.flat_map(&:notes),
S
Sean McGivern 已提交
455 456 457 458 459 460 461 462
      @project,
      current_user,
      @path,
      @project_wiki,
      @ref
    )
  end

463 464 465 466 467
  def invalid_mr
    # Render special view for MR with removed source or target branch
    render 'invalid'
  end

468
  def merge_request_params
469
    params.require(:merge_request).permit(
470 471
      :title, :assignee_id, :source_project_id, :source_branch,
      :target_project_id, :target_branch, :milestone_id,
472
      :state_event, :description, :task_num, :force_remove_source_branch,
473
      label_ids: []
474 475
    )
  end
476

Z
Zeger-Jan van de Weg 已提交
477 478 479 480
  def merge_params
    params.permit(:should_remove_source_branch, :commit_message)
  end

481 482 483 484 485
  # 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
486 487 488 489 490

  def merge_when_build_succeeds_active?
    params[:merge_when_build_succeeds].present? &&
      @merge_request.pipeline && @merge_request.pipeline.active?
  end
S
Sean McGivern 已提交
491 492 493 494 495

  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 已提交
496
end