merge_requests_controller.rb 13.4 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, :builds, :merge, :merge_check,
13
    :ci_status, :toggle_subscription, :cancel_merge_when_build_succeeds, :remove_wip
14
  ]
D
Douwe Maan 已提交
15 16
  before_action :validates_merge_request, only: [:show, :diffs, :commits, :builds]
  before_action :define_show_vars, only: [:show, :diffs, :commits, :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]
D
Douwe Maan 已提交
20
  before_action :ensure_ref_fetched, only: [:show, :diffs, :commits, :builds]
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

D
Douwe Maan 已提交
133 134
  def builds
    respond_to do |format|
135 136 137 138 139
      format.html do
        define_discussion_vars

        render 'show'
      end
D
Douwe Maan 已提交
140 141 142 143
      format.json { render json: { html: view_to_html_string('projects/merge_requests/show/_builds') } }
    end
  end

D
Dmitriy Zaporozhets 已提交
144
  def new
S
Sean McGivern 已提交
145
    build_merge_request
146
    @noteable = @merge_request
D
Dmitriy Zaporozhets 已提交
147 148 149 150 151 152 153 154 155

    @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 已提交
156
    @commits = @merge_request.compare_commits.reverse
157
    @commit = @merge_request.diff_head_commit
158
    @base_commit = @merge_request.diff_base_commit
159
    @diffs = @merge_request.diffs(diff_options) if @merge_request.compare
160
    @diff_notes_disabled = true
D
Douwe Maan 已提交
161

162 163
    @pipeline = @merge_request.pipeline
    @statuses = @pipeline.statuses if @pipeline
D
Douwe Maan 已提交
164

D
Dmitriy Zaporozhets 已提交
165 166
    @note_counts = Note.where(commit_id: @commits.map(&:id)).
      group(:commit_id).count
D
Dmitriy Zaporozhets 已提交
167 168 169
  end

  def create
I
Izaak Alpert 已提交
170
    @target_branches ||= []
171
    @merge_request = MergeRequests::CreateService.new(project, current_user, merge_request_params).execute
172 173

    if @merge_request.valid?
174
      redirect_to(merge_request_path(@merge_request))
175
    else
I
Izaak Alpert 已提交
176 177 178
      @source_project = @merge_request.source_project
      @target_project = @merge_request.target_project
      render action: "new"
D
Dmitriy Zaporozhets 已提交
179 180 181
    end
  end

D
Douwe Maan 已提交
182 183 184 185 186 187
  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 已提交
188
  def update
189
    @merge_request = MergeRequests::UpdateService.new(project, current_user, merge_request_params).execute(@merge_request)
190

191
    if @merge_request.valid?
192 193
      respond_to do |format|
        format.html do
V
Vinnie Okada 已提交
194
          redirect_to([@merge_request.target_project.namespace.becomes(Namespace),
195
                       @merge_request.target_project, @merge_request])
196
        end
197
        format.json do
198
          render json: @merge_request.to_json(include: { milestone: {}, assignee: { methods: :avatar_url }, labels: { methods: :text_color } })
199
        end
200
      end
201
    else
202
      render "edit"
D
Dmitriy Zaporozhets 已提交
203 204 205
    end
  end

206 207 208 209 210 211 212
  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

213
  def merge_check
214
    @merge_request.check_if_can_be_merged
215

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

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

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

225
  def merge
226
    return access_denied! unless @merge_request.can_be_merged_by?(current_user)
227

228 229 230
    # 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 已提交
231 232 233 234
      @status = :failed
      return
    end

235
    if params[:sha] != @merge_request.diff_head_sha
236 237 238 239
      @status = :sha_mismatch
      return
    end

240
    TodoService.new.merge_merge_request(merge_request, current_user)
241

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

244 245 246 247 248 249 250
    if params[:merge_when_build_succeeds].present?
      unless @merge_request.pipeline
        @status = :failed
        return
      end

      if @merge_request.pipeline.active?
251 252 253
        MergeRequests::MergeWhenBuildSucceedsService.new(@project, current_user, merge_params)
                                                        .execute(@merge_request)
        @status = :merge_when_build_succeeds
Z
Z.J. van de Weg 已提交
254 255 256
      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
257 258 259 260 261
        MergeWorker.perform_async(@merge_request.id, current_user.id, params)
        @status = :success
      else
        @status = :failed
      end
262
    else
Z
Zeger-Jan van de Weg 已提交
263 264
      MergeWorker.perform_async(@merge_request.id, current_user.id, params)
      @status = :success
265
    end
R
randx 已提交
266 267
  end

268
  def branch_from
F
Felipe Artur 已提交
269
    # This is always source
I
Izaak Alpert 已提交
270
    @source_project = @merge_request.nil? ? @project : @merge_request.source_project
271
    @commit = @repository.commit(params[:ref]) if params[:ref].present?
P
Phil Hughes 已提交
272
    render layout: false
273 274 275
  end

  def branch_to
I
Izaak Alpert 已提交
276
    @target_project = selected_target_project
277
    @commit = @target_project.commit(params[:ref]) if params[:ref].present?
P
Phil Hughes 已提交
278
    render layout: false
279 280
  end

I
Izaak Alpert 已提交
281 282
  def update_branches
    @target_project = selected_target_project
I
Izaak Alpert 已提交
283
    @target_branches = @target_project.repository.branch_names
284

P
Phil Hughes 已提交
285
    render layout: false
I
Izaak Alpert 已提交
286 287
  end

288
  def ci_status
289 290 291 292
    pipeline = @merge_request.pipeline
    if pipeline
      status = pipeline.status
      coverage = pipeline.try(:coverage)
293

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

296
      status ||= "preparing"
297 298
    else
      ci_service = @merge_request.source_project.ci_service
299
      status = ci_service.commit_status(merge_request.diff_head_sha, merge_request.source_branch) if ci_service
300

301
      if ci_service.respond_to?(:commit_coverage)
302
        coverage = ci_service.commit_coverage(merge_request.diff_head_sha, merge_request.source_branch)
303
      end
304 305 306
    end

    response = {
307
      title: merge_request.title,
308
      sha: merge_request.diff_head_commit.short_id,
309 310 311
      status: status,
      coverage: coverage
    }
312 313 314 315

    render json: response
  end

D
Dmitriy Zaporozhets 已提交
316 317
  protected

I
Izaak Alpert 已提交
318
  def selected_target_project
319 320 321 322 323
    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 已提交
324 325
  end

D
Dmitriy Zaporozhets 已提交
326
  def merge_request
S
skv 已提交
327
    @merge_request ||= @project.merge_requests.find_by!(iid: params[:id])
D
Dmitriy Zaporozhets 已提交
328
  end
329
  alias_method :subscribable_resource, :merge_request
330
  alias_method :issuable, :merge_request
331
  alias_method :awardable, :merge_request
D
Dmitriy Zaporozhets 已提交
332

D
Dmitriy Zaporozhets 已提交
333
  def authorize_update_merge_request!
334
    return render_404 unless can?(current_user, :update_merge_request, @merge_request)
D
Dmitriy Zaporozhets 已提交
335 336 337
  end

  def authorize_admin_merge_request!
338
    return render_404 unless can?(current_user, :admin_merge_request, @merge_request)
D
Dmitriy Zaporozhets 已提交
339
  end
340 341 342 343

  def module_enabled
    return render_404 unless @project.merge_requests_enabled
  end
344 345

  def validates_merge_request
346 347 348
    # If source project was removed (Ex. mr from fork to origin)
    return invalid_mr unless @merge_request.source_project

349 350 351
    # Show git not found page
    # if there is no saved commits between source & target branch
    if @merge_request.commits.blank?
352 353
      # and if target branch doesn't exist
      return invalid_mr unless @merge_request.target_branch_exists?
354

355 356
      # or if source branch doesn't exist
      return invalid_mr unless @merge_request.source_branch_exists?
357
    end
358 359 360
  end

  def define_show_vars
361 362 363 364 365 366 367 368 369 370 371 372
    @noteable = @merge_request
    @commits_count = @merge_request.commits.count

    @pipeline = @merge_request.pipeline
    @statuses = @pipeline.statuses if @pipeline

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

373 374 375
  # 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
376
    # Build a note object for comment form
377
    @note = @project.notes.new(noteable: @noteable)
378

379
    @discussions = @noteable.mr_and_commit_notes.
380 381 382 383
      inc_author_project_award_emoji.
      fresh.
      discussions

384 385
    preload_noteable_for_regular_notes(@discussions.flat_map(&:notes))

386
    # This is not executed lazily
387
    @notes = Banzai::NoteRenderer.render(
388
      @discussions.flat_map(&:notes),
389 390 391 392 393 394
      @project,
      current_user,
      @path,
      @project_wiki,
      @ref
    )
395

S
Stan Hu 已提交
396
    preload_max_access_for_authors(@notes, @project)
397 398
  end

399
  def define_widget_vars
400 401
    @pipeline = @merge_request.pipeline
    @pipelines = [@pipeline].compact
402 403
  end

S
Sean McGivern 已提交
404 405 406 407 408 409 410 411 412 413 414 415
  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?
416
    @grouped_diff_discussions = @merge_request.notes.inc_author_project_award_emoji.grouped_diff_discussions
S
Sean McGivern 已提交
417 418

    Banzai::NoteRenderer.render(
419
      @grouped_diff_discussions.values.flat_map(&:notes),
S
Sean McGivern 已提交
420 421 422 423 424 425 426 427
      @project,
      current_user,
      @path,
      @project_wiki,
      @ref
    )
  end

428 429 430 431 432
  def invalid_mr
    # Render special view for MR with removed source or target branch
    render 'invalid'
  end

433
  def merge_request_params
434
    params.require(:merge_request).permit(
435 436
      :title, :assignee_id, :source_project_id, :source_branch,
      :target_project_id, :target_branch, :milestone_id,
437
      :state_event, :description, :task_num, :force_remove_source_branch,
438
      label_ids: []
439 440
    )
  end
441

Z
Zeger-Jan van de Weg 已提交
442 443 444 445
  def merge_params
    params.permit(:should_remove_source_branch, :commit_message)
  end

446 447 448 449 450
  # 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
451 452 453 454 455

  def merge_when_build_succeeds_active?
    params[:merge_when_build_succeeds].present? &&
      @merge_request.pipeline && @merge_request.pipeline.active?
  end
S
Sean McGivern 已提交
456 457 458 459 460

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