merge_requests_controller.rb 13.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 ToggleAwardEmoji
J
Jacob Vosmaer 已提交
7

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

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

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

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

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

    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
40

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

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

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

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

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

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

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

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

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

79
  def diffs
80 81
    apply_diff_view_cookie!

82 83
    @merge_request_diff = @merge_request.merge_request_diff

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

208
  def merge_check
209
    @merge_request.check_if_can_be_merged
210

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

289 290
      status = "success_with_warnings" if pipeline.success? && pipeline.with_warnings?

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

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

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

    render json: response
  end

D
Dmitriy Zaporozhets 已提交
311 312
  protected

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

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

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

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

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

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

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

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

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

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

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

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

390
  def define_widget_vars
391 392
    @pipeline = @merge_request.pipeline
    @pipelines = [@pipeline].compact
393 394
  end

S
Sean McGivern 已提交
395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418
  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?
    @grouped_diff_notes = @merge_request.notes.grouped_diff_notes

    Banzai::NoteRenderer.render(
      @grouped_diff_notes.values.flatten,
      @project,
      current_user,
      @path,
      @project_wiki,
      @ref
    )
  end

419 420 421 422 423
  def invalid_mr
    # Render special view for MR with removed source or target branch
    render 'invalid'
  end

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

Z
Zeger-Jan van de Weg 已提交
433 434 435 436
  def merge_params
    params.permit(:should_remove_source_branch, :commit_message)
  end

437 438 439 440 441
  # 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
442 443 444 445 446

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

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