merge_requests_controller.rb 12.9 KB
Newer Older
1 2
# frozen_string_literal: true

D
Douwe Maan 已提交
3
class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationController
4
  include ToggleSubscriptionAction
5
  include IssuableActions
D
Douwe Maan 已提交
6
  include RendersNotes
7
  include RendersCommits
8
  include RendersAssignees
9
  include ToggleAwardEmoji
10
  include IssuableCollections
11
  include RecordUserLastActivity
12
  include SourcegraphDecorator
J
Jacob Vosmaer 已提交
13

D
Douwe Maan 已提交
14
  skip_before_action :merge_request, only: [:index, :bulk_update]
15
  before_action :whitelist_query_limiting, only: [:assign_related_issues, :update]
16
  before_action :authorize_update_issuable!, only: [:close, :edit, :update, :remove_wip, :sort]
17 18 19 20 21 22 23
  before_action :authorize_read_actual_head_pipeline!, only: [
    :test_reports,
    :exposed_artifacts,
    :coverage_reports,
    :terraform_reports,
    :accessibility_reports
  ]
J
Jarka Kadlecova 已提交
24
  before_action :set_issuables_index, only: [:index]
25
  before_action :authenticate_user!, only: [:assign_related_issues]
26
  before_action :check_user_can_push_to_source_branch!, only: [:rebase]
27
  before_action only: [:show] do
28
    push_frontend_feature_flag(:diffs_batch_load, @project, default_enabled: true)
29
    push_frontend_feature_flag(:deploy_from_footer, @project, default_enabled: true)
30
    push_frontend_feature_flag(:single_mr_diff_view, @project, default_enabled: true)
31
    push_frontend_feature_flag(:suggest_pipeline) if experiment_enabled?(:suggest_pipeline)
32
    push_frontend_feature_flag(:code_navigation, @project)
33
    push_frontend_feature_flag(:widget_visibility_polling, @project, default_enabled: true)
34
    push_frontend_feature_flag(:merge_ref_head_comments, @project)
35
    push_frontend_feature_flag(:mr_commit_neighbor_nav, @project, default_enabled: true)
36
    push_frontend_feature_flag(:multiline_comments, @project)
37
    push_frontend_feature_flag(:file_identifier_hash)
38
    push_frontend_feature_flag(:batch_suggestions, @project)
39
  end
40

41 42 43 44
  before_action do
    push_frontend_feature_flag(:vue_issuable_sidebar, @project.group)
  end

45
  around_action :allow_gitaly_ref_name_caching, only: [:index, :show, :discussions]
46

D
Dmitriy Zaporozhets 已提交
47
  def index
J
Jarka Kadlecova 已提交
48
    @merge_requests = @issuables
C
Clement Ho 已提交
49

50 51 52 53
    respond_to do |format|
      format.html
      format.json do
        render json: {
54
          html: view_to_html_string("projects/merge_requests/_merge_requests")
55 56 57
        }
      end
    end
D
Dmitriy Zaporozhets 已提交
58 59 60
  end

  def show
61
    close_merge_request_if_no_source_project
62
    @merge_request.check_mergeability(async: true)
63

64
    respond_to do |format|
F
Fatih Acet 已提交
65
      format.html do
66 67 68
        # use next to appease Rubocop
        next render('invalid') if target_branch_missing?

69 70
        preload_assignees_for_render(@merge_request)

D
Douwe Maan 已提交
71 72 73 74 75
        # Build a note object for comment form
        @note = @project.notes.new(noteable: @merge_request)

        @noteable = @merge_request
        @commits_count = @merge_request.commits_count
76
        @issuable_sidebar = serializer.represent(@merge_request, serializer: 'sidebar')
77
        @current_user_data = UserSerializer.new(project: @project).represent(current_user, {}, MergeRequestUserEntity).to_json
78
        @show_whitespace_default = current_user.nil? || current_user.show_whitespace_in_diffs
79
        @coverage_path = coverage_reports_project_merge_request_path(@project, @merge_request, format: :json) if @merge_request.has_coverage_reports?
D
Douwe Maan 已提交
80 81

        set_pipeline_variables
82

Z
Zeger-Jan van de Weg 已提交
83
        render
F
Fatih Acet 已提交
84
      end
S
Sean McGivern 已提交
85

D
Douwe Maan 已提交
86
      format.json do
87 88
        Gitlab::PollingInterval.set_header(response, interval: 10_000)

E
Eric Eastwood 已提交
89
        render json: serializer.represent(@merge_request, serializer: params[:serializer])
D
Douwe Maan 已提交
90 91
      end

92
      format.patch do
93
        break render_404 unless @merge_request.diff_refs
D
Douwe Maan 已提交
94 95

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

98
      format.diff do
99
        break render_404 unless @merge_request.diff_refs
100

D
Douwe Maan 已提交
101
        send_git_diff @project.repository, @merge_request.diff_refs
102
      end
103
    end
R
randx 已提交
104 105
  end

106
  def commits
D
Douwe Maan 已提交
107 108
    # Get commits from repository
    # or from cache if already merged
109
    @commits =
110 111 112 113
      set_commits_for_rendering(
        @merge_request.recent_commits.with_latest_pipeline(@merge_request.source_branch),
          commits_count: @merge_request.commits_count
      )
114

D
Douwe Maan 已提交
115
    render json: { html: view_to_html_string('projects/merge_requests/_commits') }
116 117
  end

118
  def pipelines
119 120
    set_pipeline_variables
    @pipelines = @pipelines.page(params[:page]).per(30)
121

D
Douwe Maan 已提交
122
    Gitlab::PollingInterval.set_header(response, interval: 10_000)
123

124 125 126
    render json: {
      pipelines: PipelineSerializer
        .new(project: @project, current_user: @current_user)
127
        .with_pagination(request, response)
128 129 130 131 132
        .represent(@pipelines),
      count: {
        all: @pipelines.count
      }
    }
D
Dmitriy Zaporozhets 已提交
133 134
  end

135 136 137 138 139 140 141 142 143
  def context_commits
    return render_404 unless project.context_commits_enabled?

    # Get commits from repository
    # or from cache if already merged
    commits = ContextCommitsFinder.new(project, @merge_request, { search: params[:search], limit: params[:limit], offset: params[:offset] }).execute
    render json: CommitEntity.represent(commits, { type: :full, request: merge_request })
  end

S
Shinya Maeda 已提交
144
  def test_reports
M
Matija Čupić 已提交
145
    reports_response(@merge_request.compare_test_reports)
S
Shinya Maeda 已提交
146 147
  end

148 149 150 151 152 153 154 155
  def accessibility_reports
    if @merge_request.has_accessibility_reports?
      reports_response(@merge_request.compare_accessibility_reports)
    else
      head :no_content
    end
  end

156 157 158 159 160 161 162 163
  def coverage_reports
    if @merge_request.has_coverage_reports?
      reports_response(@merge_request.find_coverage_reports)
    else
      head :no_content
    end
  end

164 165 166 167
  def terraform_reports
    reports_response(@merge_request.find_terraform_reports)
  end

168 169 170 171 172 173 174 175
  def exposed_artifacts
    if @merge_request.has_exposed_artifacts?
      reports_response(@merge_request.find_exposed_artifacts)
    else
      head :no_content
    end
  end

D
Douwe Maan 已提交
176
  def edit
D
Douwe Maan 已提交
177
    define_edit_vars
D
Douwe Maan 已提交
178 179
  end

D
Dmitriy Zaporozhets 已提交
180
  def update
D
Douwe Maan 已提交
181
    @merge_request = ::MergeRequests::UpdateService.new(project, current_user, merge_request_params).execute(@merge_request)
182

183 184
    respond_to do |format|
      format.html do
185
        if @merge_request.errors.present?
D
Douwe Maan 已提交
186 187
          define_edit_vars

188
          render :edit
189 190
        else
          redirect_to project_merge_request_path(@merge_request.target_project, @merge_request)
191
        end
192
      end
193 194

      format.json do
195 196 197 198 199
        if merge_request.errors.present?
          render json: @merge_request.errors, status: :bad_request
        else
          render json: serializer.represent(@merge_request, serializer: 'basic')
        end
200
      end
D
Dmitriy Zaporozhets 已提交
201
    end
202
  rescue ActiveRecord::StaleObjectError
D
Douwe Maan 已提交
203 204
    define_edit_vars if request.format.html?

205
    render_conflict_response
D
Dmitriy Zaporozhets 已提交
206 207
  end

208
  def remove_wip
D
Douwe Maan 已提交
209
    @merge_request = ::MergeRequests::UpdateService
F
Fatih Acet 已提交
210 211
      .new(project, current_user, wip_event: 'unwip')
      .execute(@merge_request)
212

213
    render json: serialize_widget(@merge_request)
214 215
  end

F
Fatih Acet 已提交
216 217
  def commit_change_content
    render partial: 'projects/merge_requests/widget/commit_change_content', layout: false
V
Valery Sizov 已提交
218 219
  end

S
Shinya Maeda 已提交
220 221
  def cancel_auto_merge
    unless @merge_request.can_cancel_auto_merge?(current_user)
222 223
      return access_denied!
    end
Z
Zeger-Jan van de Weg 已提交
224

S
Shinya Maeda 已提交
225
    AutoMergeService.new(project, current_user).cancel(@merge_request)
F
Fatih Acet 已提交
226

227
    render json: serialize_widget(@merge_request)
Z
Zeger-Jan van de Weg 已提交
228 229
  end

230
  def merge
231 232 233
    access_check_result = merge_access_check

    return access_check_result if access_check_result
234

F
Fatih Acet 已提交
235
    status = merge!
Z
Zeger-Jan van de Weg 已提交
236

F
Fatih Acet 已提交
237 238
    if @merge_request.merge_error
      render json: { status: status, merge_error: @merge_request.merge_error }
239
    else
F
Fatih Acet 已提交
240
      render json: { status: status }
241
    end
R
randx 已提交
242 243
  end

244
  def assign_related_issues
D
Douwe Maan 已提交
245
    result = ::MergeRequests::AssignIssuesService.new(project, current_user, merge_request: @merge_request).execute
246

D
Douwe Maan 已提交
247 248 249 250 251 252 253
    case result[:count]
    when 0
      flash[:error] = "Failed to assign you issues related to the merge request"
    when 1
      flash[:notice] = "1 issue has been assigned to you"
    else
      flash[:notice] = "#{result[:count]} issues have been assigned to you"
254
    end
D
Douwe Maan 已提交
255 256

    redirect_to(merge_request_path(@merge_request))
257 258
  end

259
  def pipeline_status
260
    render json: PipelineSerializer
F
Fatih Acet 已提交
261
      .new(project: @project, current_user: @current_user)
262
      .represent_status(head_pipeline)
263 264
  end

265
  def ci_environments_status
266 267
    environments =
      if ci_environments_status_on_merge_result?
268
        EnvironmentStatus.for_deployed_merge_request(@merge_request, current_user)
269 270 271
      else
        EnvironmentStatus.for_merge_request(@merge_request, current_user)
      end
272

273
    render json: EnvironmentStatusSerializer.new(current_user: current_user).represent(environments)
274 275
  end

276
  def rebase
277
    @merge_request.rebase_async(current_user.id)
278

279
    head :ok
280 281
  rescue MergeRequest::RebaseLockTimeout => e
    render json: { merge_error: e.message }, status: :conflict
282 283
  end

284
  def discussions
285
    merge_request.discussions_diffs.load_highlight
286 287 288 289

    super
  end

D
Dmitriy Zaporozhets 已提交
290 291
  protected

292
  alias_method :subscribable_resource, :merge_request
293
  alias_method :issuable, :merge_request
294
  alias_method :awardable, :merge_request
D
Dmitriy Zaporozhets 已提交
295

G
George Koltsov 已提交
296
  def sorting_field
297 298 299
    MergeRequest::SORTING_PREFERENCE_FIELD
  end

Z
Zeger-Jan van de Weg 已提交
300
  def merge_params
301 302 303 304
    params.permit(merge_params_attributes)
  end

  def merge_params_attributes
305
    MergeRequest::KNOWN_MERGE_PARAMS
Z
Zeger-Jan van de Weg 已提交
306 307
  end

S
Shinya Maeda 已提交
308 309 310
  def auto_merge_requested?
    # Support params[:merge_when_pipeline_succeeds] during the transition period
    params[:auto_merge_strategy].present? || params[:merge_when_pipeline_succeeds].present?
311
  end
S
Sean McGivern 已提交
312

F
Fatih Acet 已提交
313 314
  private

315 316 317 318 319 320 321
  def head_pipeline
    strong_memoize(:head_pipeline) do
      pipeline = @merge_request.head_pipeline
      pipeline if can?(current_user, :read_pipeline, pipeline)
    end
  end

322 323 324 325
  def ci_environments_status_on_merge_result?
    params[:environment_target] == 'merge_commit'
  end

326 327 328 329
  def target_branch_missing?
    @merge_request.has_no_commits? && !@merge_request.target_branch_exists?
  end

F
Fatih Acet 已提交
330
  def merge!
S
Shinya Maeda 已提交
331
    # Disable the CI check if auto_merge_strategy is specified since we have
F
Fatih Acet 已提交
332
    # to wait until CI completes to know
S
Shinya Maeda 已提交
333
    unless @merge_request.mergeable?(skip_ci_check: auto_merge_requested?)
F
Fatih Acet 已提交
334 335 336
      return :failed
    end

337 338 339 340 341 342
    merge_service = ::MergeRequests::MergeService.new(@project, current_user, merge_params)

    unless merge_service.hooks_validation_pass?(@merge_request)
      return :hook_validation_error
    end

F
Fatih Acet 已提交
343 344
    return :sha_mismatch if params[:sha] != @merge_request.diff_head_sha

345
    @merge_request.update(merge_error: nil, squash: params.fetch(:squash, false))
F
Fatih Acet 已提交
346

S
Shinya Maeda 已提交
347
    if auto_merge_requested?
348 349
      if merge_request.auto_merge_enabled?
        # TODO: We should have a dedicated endpoint for updating merge params.
350
        #       See https://gitlab.com/gitlab-org/gitlab-foss/issues/63130.
351 352 353 354 355 356
        AutoMergeService.new(project, current_user, merge_params).update(merge_request)
      else
        AutoMergeService.new(project, current_user, merge_params)
          .execute(merge_request,
                   params[:auto_merge_strategy] || AutoMergeService::STRATEGY_MERGE_WHEN_PIPELINE_SUCCEEDS)
      end
F
Fatih Acet 已提交
357
    else
358
      @merge_request.merge_async(current_user.id, merge_params)
F
Fatih Acet 已提交
359 360 361 362 363

      :success
    end
  end

364
  def serialize_widget(merge_request)
365 366 367
    cached_data = serializer.represent(merge_request, serializer: 'poll_cached_widget')
    widget_data = serializer.represent(merge_request, serializer: 'poll_widget')
    cached_data.merge!(widget_data)
368 369
  end

F
Fatih Acet 已提交
370
  def serializer
371
    @serializer ||= MergeRequestSerializer.new(current_user: current_user, project: merge_request.project)
F
Fatih Acet 已提交
372
  end
D
Douwe Maan 已提交
373 374 375 376

  def define_edit_vars
    @source_project = @merge_request.source_project
    @target_project = @merge_request.target_project
A
Alin Ciciu 已提交
377
    @noteable = @merge_request
T
Tiago Botelho 已提交
378 379 380

    # FIXME: We have to assign a presenter to another instance variable
    # due to class_name checks being made with issuable classes
381
    @mr_presenter = @merge_request.present(current_user: current_user)
D
Douwe Maan 已提交
382
  end
J
Jarka Kadlecova 已提交
383

384 385
  def finder_type
    MergeRequestsFinder
J
Jarka Kadlecova 已提交
386
  end
387 388 389 390 391 392 393 394 395 396

  def check_user_can_push_to_source_branch!
    return access_denied! unless @merge_request.source_branch_exists?

    access_check = ::Gitlab::UserAccess
      .new(current_user, project: @merge_request.source_project)
      .can_push_to_branch?(@merge_request.source_branch)

    access_denied! unless access_check
  end
397

398 399 400 401
  def merge_access_check
    access_denied! unless @merge_request.can_be_merged_by?(current_user)
  end

402
  def whitelist_query_limiting
403 404
    # Also see https://gitlab.com/gitlab-org/gitlab-foss/issues/42441
    Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-foss/issues/42438')
405
  end
M
Matija Čupić 已提交
406 407 408 409 410 411 412 413 414 415 416 417

  def reports_response(report_comparison)
    case report_comparison[:status]
    when :parsing
      ::Gitlab::PollingInterval.set_header(response, interval: 3000)

      render json: '', status: :no_content
    when :parsed
      render json: report_comparison[:data].to_json, status: :ok
    when :error
      render json: { status_reason: report_comparison[:status_reason] }, status: :bad_request
    else
418
      raise "Failed to build comparison response as comparison yielded unknown status '#{report_comparison[:status]}'"
M
Matija Čupić 已提交
419 420
    end
  end
421

422
  def authorize_read_actual_head_pipeline!
423 424
    return render_404 unless can?(current_user, :read_build, merge_request.actual_head_pipeline)
  end
D
Dmitriy Zaporozhets 已提交
425
end
426 427

Projects::MergeRequestsController.prepend_if_ee('EE::Projects::MergeRequestsController')