merge_requests_controller.rb 12.9 KB
Newer Older
1
class Projects::MergeRequestsController < Projects::ApplicationController
2
  include ToggleSubscriptionAction
J
Jacob Vosmaer 已提交
3
  include DiffHelper
4
  include IssuableActions
5
  include ToggleAwardEmoji
J
Jacob Vosmaer 已提交
6

7
  before_action :module_enabled
8
  before_action :merge_request, only: [
9
    :edit, :update, :show, :diffs, :commits, :builds, :merge, :merge_check,
10
    :ci_status, :toggle_subscription, :cancel_merge_when_build_succeeds, :remove_wip
11
  ]
D
Douwe Maan 已提交
12 13 14
  before_action :closes_issues, only: [:edit, :update, :show, :diffs, :commits, :builds]
  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
S
skv 已提交
58
    @note_counts = Note.where(commit_id: @merge_request.commits.map(&:id)).
59
      group(:commit_id).count
60

61 62
    respond_to do |format|
      format.html
S
Sean McGivern 已提交
63

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

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

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

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

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

82
  def diffs
83 84
    apply_diff_view_cookie!

85 86 87 88
    respond_to do |format|
      format.html
      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 101 102 103 104 105 106 107 108 109 110
  # 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
    diffs = @merge_request.diffs(diff_options.merge(paths: [params[:path]]))
    diff_refs = @merge_request.diff_refs

    render_diff_for_path(diffs, diff_refs, @merge_request.project)
  end

111
  def commits
112 113 114 115
    respond_to do |format|
      format.html { render 'show' }
      format.json { render json: { html: view_to_html_string('projects/merge_requests/show/_commits') } }
    end
116 117
  end

D
Douwe Maan 已提交
118 119 120 121 122 123 124
  def builds
    respond_to do |format|
      format.html { render 'show' }
      format.json { render json: { html: view_to_html_string('projects/merge_requests/show/_builds') } }
    end
  end

D
Dmitriy Zaporozhets 已提交
125
  def new
S
Sean McGivern 已提交
126
    build_merge_request
127
    @noteable = @merge_request
D
Dmitriy Zaporozhets 已提交
128 129 130 131 132 133 134 135 136

    @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 已提交
137
    @commits = @merge_request.compare_commits.reverse
138
    @commit = @merge_request.diff_head_commit
139
    @base_commit = @merge_request.diff_base_commit
J
Jacob Vosmaer 已提交
140
    @diffs = @merge_request.compare.diffs(diff_options) if @merge_request.compare
141
    @diff_notes_disabled = true
D
Douwe Maan 已提交
142

143 144
    @pipeline = @merge_request.pipeline
    @statuses = @pipeline.statuses if @pipeline
D
Douwe Maan 已提交
145

D
Dmitriy Zaporozhets 已提交
146 147
    @note_counts = Note.where(commit_id: @commits.map(&:id)).
      group(:commit_id).count
D
Dmitriy Zaporozhets 已提交
148 149 150
  end

  def create
I
Izaak Alpert 已提交
151
    @target_branches ||= []
152
    @merge_request = MergeRequests::CreateService.new(project, current_user, merge_request_params).execute
153 154

    if @merge_request.valid?
155
      redirect_to(merge_request_path(@merge_request))
156
    else
I
Izaak Alpert 已提交
157 158 159
      @source_project = @merge_request.source_project
      @target_project = @merge_request.target_project
      render action: "new"
D
Dmitriy Zaporozhets 已提交
160 161 162
    end
  end

D
Douwe Maan 已提交
163 164 165 166 167 168
  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 已提交
169
  def update
170
    @merge_request = MergeRequests::UpdateService.new(project, current_user, merge_request_params).execute(@merge_request)
171

172
    if @merge_request.valid?
173 174
      respond_to do |format|
        format.html do
V
Vinnie Okada 已提交
175
          redirect_to([@merge_request.target_project.namespace.becomes(Namespace),
176
                       @merge_request.target_project, @merge_request])
177
        end
178
        format.json do
179
          render json: @merge_request.to_json(include: { milestone: {}, assignee: { methods: :avatar_url }, labels: { methods: :text_color } })
180
        end
181
      end
182
    else
183
      render "edit"
D
Dmitriy Zaporozhets 已提交
184 185 186
    end
  end

187 188 189 190 191 192 193
  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

194
  def merge_check
195
    @merge_request.check_if_can_be_merged
196

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

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

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

206
  def merge
207
    return access_denied! unless @merge_request.can_be_merged_by?(current_user)
208

209 210 211
    # 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 已提交
212 213 214 215
      @status = :failed
      return
    end

216
    if params[:sha] != @merge_request.diff_head_sha
217 218 219 220
      @status = :sha_mismatch
      return
    end

221
    TodoService.new.merge_merge_request(merge_request, current_user)
222

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

225 226 227 228 229 230 231
    if params[:merge_when_build_succeeds].present?
      unless @merge_request.pipeline
        @status = :failed
        return
      end

      if @merge_request.pipeline.active?
232 233 234
        MergeRequests::MergeWhenBuildSucceedsService.new(@project, current_user, merge_params)
                                                        .execute(@merge_request)
        @status = :merge_when_build_succeeds
Z
Z.J. van de Weg 已提交
235 236 237
      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
238 239 240 241 242
        MergeWorker.perform_async(@merge_request.id, current_user.id, params)
        @status = :success
      else
        @status = :failed
      end
243
    else
Z
Zeger-Jan van de Weg 已提交
244 245
      MergeWorker.perform_async(@merge_request.id, current_user.id, params)
      @status = :success
246
    end
R
randx 已提交
247 248
  end

249
  def branch_from
F
Felipe Artur 已提交
250
    # This is always source
I
Izaak Alpert 已提交
251
    @source_project = @merge_request.nil? ? @project : @merge_request.source_project
252
    @commit = @repository.commit(params[:ref]) if params[:ref].present?
P
Phil Hughes 已提交
253
    render layout: false
254 255 256
  end

  def branch_to
I
Izaak Alpert 已提交
257
    @target_project = selected_target_project
258
    @commit = @target_project.commit(params[:ref]) if params[:ref].present?
P
Phil Hughes 已提交
259
    render layout: false
260 261
  end

I
Izaak Alpert 已提交
262 263
  def update_branches
    @target_project = selected_target_project
I
Izaak Alpert 已提交
264
    @target_branches = @target_project.repository.branch_names
265

P
Phil Hughes 已提交
266
    render layout: false
I
Izaak Alpert 已提交
267 268
  end

269
  def ci_status
270 271 272 273
    pipeline = @merge_request.pipeline
    if pipeline
      status = pipeline.status
      coverage = pipeline.try(:coverage)
274 275

      status ||= "preparing"
276 277
    else
      ci_service = @merge_request.source_project.ci_service
278
      status = ci_service.commit_status(merge_request.diff_head_sha, merge_request.source_branch) if ci_service
279

280
      if ci_service.respond_to?(:commit_coverage)
281
        coverage = ci_service.commit_coverage(merge_request.diff_head_sha, merge_request.source_branch)
282
      end
283 284 285
    end

    response = {
286
      title: merge_request.title,
287
      sha: merge_request.diff_head_commit.short_id,
288 289 290
      status: status,
      coverage: coverage
    }
291 292 293 294

    render json: response
  end

D
Dmitriy Zaporozhets 已提交
295 296
  protected

I
Izaak Alpert 已提交
297
  def selected_target_project
298 299 300 301 302
    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 已提交
303 304
  end

D
Dmitriy Zaporozhets 已提交
305
  def merge_request
S
skv 已提交
306
    @merge_request ||= @project.merge_requests.find_by!(iid: params[:id])
D
Dmitriy Zaporozhets 已提交
307
  end
308
  alias_method :subscribable_resource, :merge_request
309
  alias_method :issuable, :merge_request
310
  alias_method :awardable, :merge_request
D
Dmitriy Zaporozhets 已提交
311

312 313 314 315
  def closes_issues
    @closes_issues ||= @merge_request.closes_issues
  end

D
Dmitriy Zaporozhets 已提交
316
  def authorize_update_merge_request!
317
    return render_404 unless can?(current_user, :update_merge_request, @merge_request)
D
Dmitriy Zaporozhets 已提交
318 319 320
  end

  def authorize_admin_merge_request!
321
    return render_404 unless can?(current_user, :admin_merge_request, @merge_request)
D
Dmitriy Zaporozhets 已提交
322
  end
323 324 325 326

  def module_enabled
    return render_404 unless @project.merge_requests_enabled
  end
327 328

  def validates_merge_request
329 330 331
    # If source project was removed (Ex. mr from fork to origin)
    return invalid_mr unless @merge_request.source_project

332 333 334
    # Show git not found page
    # if there is no saved commits between source & target branch
    if @merge_request.commits.blank?
335 336
      # and if target branch doesn't exist
      return invalid_mr unless @merge_request.target_branch_exists?
337

338 339
      # or if source branch doesn't exist
      return invalid_mr unless @merge_request.source_branch_exists?
340
    end
341 342 343 344
  end

  def define_show_vars
    # Build a note object for comment form
345
    @note = @project.notes.new(noteable: @merge_request)
346 347 348 349 350 351 352 353 354 355 356 357 358 359 360

    @discussions = @merge_request.mr_and_commit_notes.
      inc_author_project_award_emoji.
      fresh.
      discussions

    @notes = Banzai::NoteRenderer.render(
      @discussions.flatten,
      @project,
      current_user,
      @path,
      @project_wiki,
      @ref
    )

361
    @noteable = @merge_request
362

363
    # Get commits from repository
364 365
    # or from cache if already merged
    @commits = @merge_request.commits
366

D
Dmitriy Zaporozhets 已提交
367
    @merge_request_diff = @merge_request.merge_request_diff
368

369 370
    @pipeline = @merge_request.pipeline
    @statuses = @pipeline.statuses if @pipeline
D
Douwe Maan 已提交
371

372 373 374 375
    if @merge_request.locked_long_ago?
      @merge_request.unlock_mr
      @merge_request.close
    end
376 377
  end

378
  def define_widget_vars
379 380
    @pipeline = @merge_request.pipeline
    @pipelines = [@pipeline].compact
381
    closes_issues
382 383
  end

S
Sean McGivern 已提交
384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407
  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

408 409 410 411 412
  def invalid_mr
    # Render special view for MR with removed source or target branch
    render 'invalid'
  end

413
  def merge_request_params
414
    params.require(:merge_request).permit(
415 416
      :title, :assignee_id, :source_project_id, :source_branch,
      :target_project_id, :target_branch, :milestone_id,
417 418
      :state_event, :description, :task_num, :force_remove_source_branch,
      label_ids: []
419 420
    )
  end
421

Z
Zeger-Jan van de Weg 已提交
422 423 424 425
  def merge_params
    params.permit(:should_remove_source_branch, :commit_message)
  end

426 427 428 429 430
  # 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
431 432 433 434 435

  def merge_when_build_succeeds_active?
    params[:merge_when_build_succeeds].present? &&
      @merge_request.pipeline && @merge_request.pipeline.active?
  end
S
Sean McGivern 已提交
436 437 438 439 440

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