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
J
Jacob Vosmaer 已提交
8

9
  before_action :module_enabled
10
  before_action :merge_request, only: [
11
    :edit, :update, :show, :diffs, :commits, :builds, :merge, :merge_check,
12
    :ci_status, :toggle_subscription, :cancel_merge_when_build_succeeds, :remove_wip
13
  ]
D
Douwe Maan 已提交
14 15
  before_action :validates_merge_request, only: [:show, :diffs, :commits, :builds]
  before_action :define_show_vars, only: [:show, :diffs, :commits, :builds]
16
  before_action :define_widget_vars, only: [:merge, :cancel_merge_when_build_succeeds, :merge_check]
S
Sean McGivern 已提交
17 18
  before_action :define_commit_vars, only: [:diffs]
  before_action :define_diff_comment_vars, only: [:diffs]
D
Douwe Maan 已提交
19
  before_action :ensure_ref_fetched, only: [:show, :diffs, :commits, :builds]
D
Dmitriy Zaporozhets 已提交
20 21

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

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

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

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

    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
41

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

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

47 48 49 50
    respond_to do |format|
      format.html
      format.json do
        render json: {
51
          html: view_to_html_string("projects/merge_requests/_merge_requests"),
P
Phil Hughes 已提交
52
          labels: @labels.as_json(methods: :text_color)
53 54 55
        }
      end
    end
D
Dmitriy Zaporozhets 已提交
56 57 58
  end

  def show
59
    respond_to do |format|
60
      format.html { define_discussion_vars }
S
Sean McGivern 已提交
61

D
Douwe Maan 已提交
62 63 64 65
      format.json do
        render json: @merge_request
      end

Z
Z.J. van de Weg 已提交
66
      format.patch  do
D
Douwe Maan 已提交
67 68 69
        return render_404 unless @merge_request.diff_refs

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

72
      format.diff do
D
Douwe Maan 已提交
73
        return render_404 unless @merge_request.diff_refs
74

D
Douwe Maan 已提交
75
        send_git_diff @project.repository, @merge_request.diff_refs
76
      end
77
    end
R
randx 已提交
78 79
  end

80
  def diffs
81 82
    apply_diff_view_cookie!

83 84
    @merge_request_diff = @merge_request.merge_request_diff

85
    respond_to do |format|
86
      format.html { define_discussion_vars }
87 88
      format.json { render json: { html: view_to_html_string("projects/merge_requests/show/_diffs") } }
    end
D
Dmitriy Zaporozhets 已提交
89 90
  end

S
Sean McGivern 已提交
91 92 93 94 95 96 97 98 99 100
  # 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
101
      @grouped_diff_discussions = {}
S
Sean McGivern 已提交
102 103 104
    end

    define_commit_vars
S
Sean McGivern 已提交
105
    diffs = @merge_request.diffs(diff_options)
S
Sean McGivern 已提交
106

S
Sean McGivern 已提交
107
    render_diff_for_path(diffs, @merge_request.diff_refs, @merge_request.project)
S
Sean McGivern 已提交
108 109
  end

110
  def commits
111
    respond_to do |format|
112 113 114 115 116
      format.html do
        define_discussion_vars

        render 'show'
      end
117 118 119 120 121 122 123 124 125
      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
126
    end
127 128
  end

D
Douwe Maan 已提交
129 130
  def builds
    respond_to do |format|
131 132 133 134 135
      format.html do
        define_discussion_vars

        render 'show'
      end
D
Douwe Maan 已提交
136 137 138 139
      format.json { render json: { html: view_to_html_string('projects/merge_requests/show/_builds') } }
    end
  end

D
Dmitriy Zaporozhets 已提交
140
  def new
S
Sean McGivern 已提交
141
    build_merge_request
142
    @noteable = @merge_request
D
Dmitriy Zaporozhets 已提交
143 144 145 146 147 148 149 150 151

    @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 已提交
152
    @commits = @merge_request.compare_commits.reverse
153
    @commit = @merge_request.diff_head_commit
154
    @base_commit = @merge_request.diff_base_commit
J
Jacob Vosmaer 已提交
155
    @diffs = @merge_request.compare.diffs(diff_options) if @merge_request.compare
156
    @diff_notes_disabled = true
D
Douwe Maan 已提交
157

158 159
    @pipeline = @merge_request.pipeline
    @statuses = @pipeline.statuses if @pipeline
D
Douwe Maan 已提交
160

D
Dmitriy Zaporozhets 已提交
161 162
    @note_counts = Note.where(commit_id: @commits.map(&:id)).
      group(:commit_id).count
D
Dmitriy Zaporozhets 已提交
163 164 165
  end

  def create
I
Izaak Alpert 已提交
166
    @target_branches ||= []
167
    @merge_request = MergeRequests::CreateService.new(project, current_user, merge_request_params).execute
168 169

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

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

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

202 203 204 205 206 207 208
  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

209
  def merge_check
210
    @merge_request.check_if_can_be_merged
211

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

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

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

221
  def merge
222
    return access_denied! unless @merge_request.can_be_merged_by?(current_user)
223

224 225 226
    # 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 已提交
227 228 229 230
      @status = :failed
      return
    end

231
    if params[:sha] != @merge_request.diff_head_sha
232 233 234 235
      @status = :sha_mismatch
      return
    end

236
    TodoService.new.merge_merge_request(merge_request, current_user)
237

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

240 241 242 243 244 245 246
    if params[:merge_when_build_succeeds].present?
      unless @merge_request.pipeline
        @status = :failed
        return
      end

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

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

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

I
Izaak Alpert 已提交
277 278
  def update_branches
    @target_project = selected_target_project
I
Izaak Alpert 已提交
279
    @target_branches = @target_project.repository.branch_names
280

P
Phil Hughes 已提交
281
    render layout: false
I
Izaak Alpert 已提交
282 283
  end

284
  def ci_status
285 286 287 288
    pipeline = @merge_request.pipeline
    if pipeline
      status = pipeline.status
      coverage = pipeline.try(:coverage)
289

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

292
      status ||= "preparing"
293 294
    else
      ci_service = @merge_request.source_project.ci_service
295
      status = ci_service.commit_status(merge_request.diff_head_sha, merge_request.source_branch) if ci_service
296

297
      if ci_service.respond_to?(:commit_coverage)
298
        coverage = ci_service.commit_coverage(merge_request.diff_head_sha, merge_request.source_branch)
299
      end
300 301 302
    end

    response = {
303
      title: merge_request.title,
304
      sha: merge_request.diff_head_commit.short_id,
305 306 307
      status: status,
      coverage: coverage
    }
308 309 310 311

    render json: response
  end

D
Dmitriy Zaporozhets 已提交
312 313
  protected

I
Izaak Alpert 已提交
314
  def selected_target_project
315 316 317 318 319
    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 已提交
320 321
  end

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

D
Dmitriy Zaporozhets 已提交
329
  def authorize_update_merge_request!
330
    return render_404 unless can?(current_user, :update_merge_request, @merge_request)
D
Dmitriy Zaporozhets 已提交
331 332 333
  end

  def authorize_admin_merge_request!
334
    return render_404 unless can?(current_user, :admin_merge_request, @merge_request)
D
Dmitriy Zaporozhets 已提交
335
  end
336 337 338 339

  def module_enabled
    return render_404 unless @project.merge_requests_enabled
  end
340 341

  def validates_merge_request
342 343 344
    # If source project was removed (Ex. mr from fork to origin)
    return invalid_mr unless @merge_request.source_project

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

351 352
      # or if source branch doesn't exist
      return invalid_mr unless @merge_request.source_branch_exists?
353
    end
354 355 356
  end

  def define_show_vars
357 358 359 360 361 362 363 364 365 366 367 368
    @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

369 370 371
  # 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
372
    # Build a note object for comment form
373
    @note = @project.notes.new(noteable: @noteable)
374

375
    @discussions = @noteable.mr_and_commit_notes.
376 377 378 379
      inc_author_project_award_emoji.
      fresh.
      discussions

380
    # This is not executed lazily
381
    @notes = Banzai::NoteRenderer.render(
382
      @discussions.flat_map(&:notes),
383 384 385 386 387 388
      @project,
      current_user,
      @path,
      @project_wiki,
      @ref
    )
389

S
Stan Hu 已提交
390
    preload_max_access_for_authors(@notes, @project)
391 392
  end

393
  def define_widget_vars
394 395
    @pipeline = @merge_request.pipeline
    @pipelines = [@pipeline].compact
396 397
  end

S
Sean McGivern 已提交
398 399 400 401 402 403 404 405 406 407 408 409
  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?
410
    @grouped_diff_discussions = @merge_request.notes.inc_author_project_award_emoji.grouped_diff_discussions
S
Sean McGivern 已提交
411 412

    Banzai::NoteRenderer.render(
413
      @grouped_diff_discussions.values.flat_map(&:notes),
S
Sean McGivern 已提交
414 415 416 417 418 419 420 421
      @project,
      current_user,
      @path,
      @project_wiki,
      @ref
    )
  end

422 423 424 425 426
  def invalid_mr
    # Render special view for MR with removed source or target branch
    render 'invalid'
  end

427
  def merge_request_params
428
    params.require(:merge_request).permit(
429 430
      :title, :assignee_id, :source_project_id, :source_branch,
      :target_project_id, :target_branch, :milestone_id,
431
      :state_event, :description, :task_num, :force_remove_source_branch,
432
      label_ids: []
433 434
    )
  end
435

Z
Zeger-Jan van de Weg 已提交
436 437 438 439
  def merge_params
    params.permit(:should_remove_source_branch, :commit_message)
  end

440 441 442 443 444
  # 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
445 446 447 448 449

  def merge_when_build_succeeds_active?
    params[:merge_when_build_succeeds].present? &&
      @merge_request.pipeline && @merge_request.pipeline.active?
  end
S
Sean McGivern 已提交
450 451 452 453 454

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