merge_requests_controller.rb 14.1 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, :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

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
      format.json { render json: Gitlab::Conflict::FileCollection.new(@merge_request) }
139 140 141
    end
  end

142 143 144 145 146 147 148
  def resolve_conflicts
    Gitlab::Conflict::FileCollection.new(@merge_request).resolve_conflicts!(params[:merge_request], nil, user: current_user)

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

D
Douwe Maan 已提交
149 150
  def builds
    respond_to do |format|
151 152 153 154 155
      format.html do
        define_discussion_vars

        render 'show'
      end
D
Douwe Maan 已提交
156 157 158 159
      format.json { render json: { html: view_to_html_string('projects/merge_requests/show/_builds') } }
    end
  end

D
Dmitriy Zaporozhets 已提交
160
  def new
S
Sean McGivern 已提交
161
    build_merge_request
162
    @noteable = @merge_request
D
Dmitriy Zaporozhets 已提交
163 164 165 166 167 168 169 170 171

    @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 已提交
172
    @commits = @merge_request.compare_commits.reverse
173
    @commit = @merge_request.diff_head_commit
174
    @base_commit = @merge_request.diff_base_commit
175
    @diffs = @merge_request.diffs(diff_options) if @merge_request.compare
176
    @diff_notes_disabled = true
D
Douwe Maan 已提交
177

178
    @pipeline = @merge_request.pipeline
179
    @statuses = @pipeline.statuses.relevant if @pipeline
D
Douwe Maan 已提交
180

D
Dmitriy Zaporozhets 已提交
181 182
    @note_counts = Note.where(commit_id: @commits.map(&:id)).
      group(:commit_id).count
D
Dmitriy Zaporozhets 已提交
183 184 185
  end

  def create
I
Izaak Alpert 已提交
186
    @target_branches ||= []
187
    @merge_request = MergeRequests::CreateService.new(project, current_user, merge_request_params).execute
188 189

    if @merge_request.valid?
190
      redirect_to(merge_request_path(@merge_request))
191
    else
I
Izaak Alpert 已提交
192 193 194
      @source_project = @merge_request.source_project
      @target_project = @merge_request.target_project
      render action: "new"
D
Dmitriy Zaporozhets 已提交
195 196 197
    end
  end

D
Douwe Maan 已提交
198 199 200 201 202 203
  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 已提交
204
  def update
205
    @merge_request = MergeRequests::UpdateService.new(project, current_user, merge_request_params).execute(@merge_request)
206

207
    if @merge_request.valid?
208 209
      respond_to do |format|
        format.html do
V
Vinnie Okada 已提交
210
          redirect_to([@merge_request.target_project.namespace.becomes(Namespace),
211
                       @merge_request.target_project, @merge_request])
212
        end
213
        format.json do
214
          render json: @merge_request.to_json(include: { milestone: {}, assignee: { methods: :avatar_url }, labels: { methods: :text_color } })
215
        end
216
      end
217
    else
218
      render "edit"
D
Dmitriy Zaporozhets 已提交
219 220 221
    end
  end

222 223 224 225 226 227 228
  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

229
  def merge_check
230
    @merge_request.check_if_can_be_merged
231

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

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

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

241
  def merge
242
    return access_denied! unless @merge_request.can_be_merged_by?(current_user)
243

244 245 246
    # 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 已提交
247 248 249 250
      @status = :failed
      return
    end

251
    if params[:sha] != @merge_request.diff_head_sha
252 253 254 255
      @status = :sha_mismatch
      return
    end

256
    TodoService.new.merge_merge_request(merge_request, current_user)
257

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

260 261 262 263 264 265 266
    if params[:merge_when_build_succeeds].present?
      unless @merge_request.pipeline
        @status = :failed
        return
      end

      if @merge_request.pipeline.active?
267 268 269
        MergeRequests::MergeWhenBuildSucceedsService.new(@project, current_user, merge_params)
                                                        .execute(@merge_request)
        @status = :merge_when_build_succeeds
Z
Z.J. van de Weg 已提交
270 271 272
      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
273 274 275 276 277
        MergeWorker.perform_async(@merge_request.id, current_user.id, params)
        @status = :success
      else
        @status = :failed
      end
278
    else
Z
Zeger-Jan van de Weg 已提交
279 280
      MergeWorker.perform_async(@merge_request.id, current_user.id, params)
      @status = :success
281
    end
R
randx 已提交
282 283
  end

284
  def branch_from
F
Felipe Artur 已提交
285
    # This is always source
I
Izaak Alpert 已提交
286
    @source_project = @merge_request.nil? ? @project : @merge_request.source_project
287
    @commit = @repository.commit(params[:ref]) if params[:ref].present?
P
Phil Hughes 已提交
288
    render layout: false
289 290 291
  end

  def branch_to
I
Izaak Alpert 已提交
292
    @target_project = selected_target_project
293
    @commit = @target_project.commit(params[:ref]) if params[:ref].present?
P
Phil Hughes 已提交
294
    render layout: false
295 296
  end

I
Izaak Alpert 已提交
297 298
  def update_branches
    @target_project = selected_target_project
I
Izaak Alpert 已提交
299
    @target_branches = @target_project.repository.branch_names
300

P
Phil Hughes 已提交
301
    render layout: false
I
Izaak Alpert 已提交
302 303
  end

304
  def ci_status
305 306 307 308
    pipeline = @merge_request.pipeline
    if pipeline
      status = pipeline.status
      coverage = pipeline.try(:coverage)
309

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

312
      status ||= "preparing"
313 314
    else
      ci_service = @merge_request.source_project.ci_service
315
      status = ci_service.commit_status(merge_request.diff_head_sha, merge_request.source_branch) if ci_service
316

317
      if ci_service.respond_to?(:commit_coverage)
318
        coverage = ci_service.commit_coverage(merge_request.diff_head_sha, merge_request.source_branch)
319
      end
320 321 322
    end

    response = {
323
      title: merge_request.title,
324
      sha: merge_request.diff_head_commit.short_id,
325 326 327
      status: status,
      coverage: coverage
    }
328 329 330 331

    render json: response
  end

D
Dmitriy Zaporozhets 已提交
332 333
  protected

I
Izaak Alpert 已提交
334
  def selected_target_project
335 336 337 338 339
    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 已提交
340 341
  end

D
Dmitriy Zaporozhets 已提交
342
  def merge_request
S
skv 已提交
343
    @merge_request ||= @project.merge_requests.find_by!(iid: params[:id])
D
Dmitriy Zaporozhets 已提交
344
  end
345
  alias_method :subscribable_resource, :merge_request
346
  alias_method :issuable, :merge_request
347
  alias_method :awardable, :merge_request
D
Dmitriy Zaporozhets 已提交
348

D
Dmitriy Zaporozhets 已提交
349
  def authorize_update_merge_request!
350
    return render_404 unless can?(current_user, :update_merge_request, @merge_request)
D
Dmitriy Zaporozhets 已提交
351 352 353
  end

  def authorize_admin_merge_request!
354
    return render_404 unless can?(current_user, :admin_merge_request, @merge_request)
D
Dmitriy Zaporozhets 已提交
355
  end
356 357 358 359

  def module_enabled
    return render_404 unless @project.merge_requests_enabled
  end
360 361

  def validates_merge_request
362 363 364
    # If source project was removed (Ex. mr from fork to origin)
    return invalid_mr unless @merge_request.source_project

365 366 367
    # Show git not found page
    # if there is no saved commits between source & target branch
    if @merge_request.commits.blank?
368 369
      # and if target branch doesn't exist
      return invalid_mr unless @merge_request.target_branch_exists?
370

371 372
      # or if source branch doesn't exist
      return invalid_mr unless @merge_request.source_branch_exists?
373
    end
374 375 376
  end

  def define_show_vars
377 378 379 380
    @noteable = @merge_request
    @commits_count = @merge_request.commits.count

    @pipeline = @merge_request.pipeline
381
    @statuses = @pipeline.statuses.relevant if @pipeline
382 383 384 385 386 387 388

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

389 390 391
  # 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
392
    # Build a note object for comment form
393
    @note = @project.notes.new(noteable: @noteable)
394

395
    @discussions = @noteable.mr_and_commit_notes.
396 397 398 399
      inc_author_project_award_emoji.
      fresh.
      discussions

400 401
    preload_noteable_for_regular_notes(@discussions.flat_map(&:notes))

402
    # This is not executed lazily
403
    @notes = Banzai::NoteRenderer.render(
404
      @discussions.flat_map(&:notes),
405 406 407 408 409 410
      @project,
      current_user,
      @path,
      @project_wiki,
      @ref
    )
411

S
Stan Hu 已提交
412
    preload_max_access_for_authors(@notes, @project)
413 414
  end

415
  def define_widget_vars
416 417
    @pipeline = @merge_request.pipeline
    @pipelines = [@pipeline].compact
418 419
  end

S
Sean McGivern 已提交
420 421 422 423 424 425 426 427 428 429 430 431
  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?
432
    @grouped_diff_discussions = @merge_request.notes.inc_author_project_award_emoji.grouped_diff_discussions
S
Sean McGivern 已提交
433 434

    Banzai::NoteRenderer.render(
435
      @grouped_diff_discussions.values.flat_map(&:notes),
S
Sean McGivern 已提交
436 437 438 439 440 441 442 443
      @project,
      current_user,
      @path,
      @project_wiki,
      @ref
    )
  end

444 445 446 447 448
  def invalid_mr
    # Render special view for MR with removed source or target branch
    render 'invalid'
  end

449
  def merge_request_params
450
    params.require(:merge_request).permit(
451 452
      :title, :assignee_id, :source_project_id, :source_branch,
      :target_project_id, :target_branch, :milestone_id,
453
      :state_event, :description, :task_num, :force_remove_source_branch,
454
      label_ids: []
455 456
    )
  end
457

Z
Zeger-Jan van de Weg 已提交
458 459 460 461
  def merge_params
    params.permit(:should_remove_source_branch, :commit_message)
  end

462 463 464 465 466
  # 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
467 468 469 470 471

  def merge_when_build_succeeds_active?
    params[:merge_when_build_succeeds].present? &&
      @merge_request.pipeline && @merge_request.pipeline.active?
  end
S
Sean McGivern 已提交
472 473 474 475 476

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