merge_requests_controller.rb 11.3 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 SourcegraphGon
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
  before_action :authorize_read_actual_head_pipeline!, only: [:test_reports, :exposed_artifacts]
J
Jarka Kadlecova 已提交
18
  before_action :set_issuables_index, only: [:index]
19
  before_action :authenticate_user!, only: [:assign_related_issues]
20
  before_action :check_user_can_push_to_source_branch!, only: [:rebase]
21 22
  before_action only: [:show] do
    push_frontend_feature_flag(:diffs_batch_load, @project)
23
    push_frontend_feature_flag(:single_mr_diff_view, @project)
24
  end
25

26 27
  before_action do
    push_frontend_feature_flag(:vue_issuable_sidebar, @project.group)
28
    push_frontend_feature_flag(:async_mr_widget, @project)
29 30
  end

31
  around_action :allow_gitaly_ref_name_caching, only: [:index, :show, :discussions]
32

D
Dmitriy Zaporozhets 已提交
33
  def index
J
Jarka Kadlecova 已提交
34
    @merge_requests = @issuables
C
Clement Ho 已提交
35

36 37 38 39
    respond_to do |format|
      format.html
      format.json do
        render json: {
40
          html: view_to_html_string("projects/merge_requests/_merge_requests")
41 42 43
        }
      end
    end
D
Dmitriy Zaporozhets 已提交
44 45 46
  end

  def show
47
    close_merge_request_if_no_source_project
48
    @merge_request.check_mergeability
49

50
    respond_to do |format|
F
Fatih Acet 已提交
51
      format.html do
52 53 54
        # use next to appease Rubocop
        next render('invalid') if target_branch_missing?

55 56
        preload_assignees_for_render(@merge_request)

D
Douwe Maan 已提交
57 58 59 60 61
        # Build a note object for comment form
        @note = @project.notes.new(noteable: @merge_request)

        @noteable = @merge_request
        @commits_count = @merge_request.commits_count
62
        @issuable_sidebar = serializer.represent(@merge_request, serializer: 'sidebar')
63
        @current_user_data = UserSerializer.new(project: @project).represent(current_user, {}, MergeRequestUserEntity).to_json
64
        @show_whitespace_default = current_user.nil? || current_user.show_whitespace_in_diffs
D
Douwe Maan 已提交
65 66

        set_pipeline_variables
67

Z
Zeger-Jan van de Weg 已提交
68
        render
F
Fatih Acet 已提交
69
      end
S
Sean McGivern 已提交
70

D
Douwe Maan 已提交
71
      format.json do
72 73
        Gitlab::PollingInterval.set_header(response, interval: 10_000)

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

77
      format.patch do
78
        break render_404 unless @merge_request.diff_refs
D
Douwe Maan 已提交
79 80

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

83
      format.diff do
84
        break render_404 unless @merge_request.diff_refs
85

D
Douwe Maan 已提交
86
        send_git_diff @project.repository, @merge_request.diff_refs
87
      end
88
    end
R
randx 已提交
89 90
  end

91
  def commits
D
Douwe Maan 已提交
92 93
    # Get commits from repository
    # or from cache if already merged
94
    @commits =
95 96 97 98
      set_commits_for_rendering(
        @merge_request.recent_commits.with_latest_pipeline(@merge_request.source_branch),
          commits_count: @merge_request.commits_count
      )
99

D
Douwe Maan 已提交
100
    render json: { html: view_to_html_string('projects/merge_requests/_commits') }
101 102
  end

103
  def pipelines
104 105
    set_pipeline_variables
    @pipelines = @pipelines.page(params[:page]).per(30)
106

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

109 110 111
    render json: {
      pipelines: PipelineSerializer
        .new(project: @project, current_user: @current_user)
112
        .with_pagination(request, response)
113 114 115 116 117
        .represent(@pipelines),
      count: {
        all: @pipelines.count
      }
    }
D
Dmitriy Zaporozhets 已提交
118 119
  end

S
Shinya Maeda 已提交
120
  def test_reports
M
Matija Čupić 已提交
121
    reports_response(@merge_request.compare_test_reports)
S
Shinya Maeda 已提交
122 123
  end

124 125 126 127 128 129 130 131
  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 已提交
132
  def edit
D
Douwe Maan 已提交
133
    define_edit_vars
D
Douwe Maan 已提交
134 135
  end

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

139 140
    respond_to do |format|
      format.html do
141
        if @merge_request.errors.present?
D
Douwe Maan 已提交
142 143
          define_edit_vars

144
          render :edit
145 146
        else
          redirect_to project_merge_request_path(@merge_request.target_project, @merge_request)
147
        end
148
      end
149 150

      format.json do
151 152 153 154 155
        if merge_request.errors.present?
          render json: @merge_request.errors, status: :bad_request
        else
          render json: serializer.represent(@merge_request, serializer: 'basic')
        end
156
      end
D
Dmitriy Zaporozhets 已提交
157
    end
158
  rescue ActiveRecord::StaleObjectError
D
Douwe Maan 已提交
159 160
    define_edit_vars if request.format.html?

161
    render_conflict_response
D
Dmitriy Zaporozhets 已提交
162 163
  end

164
  def remove_wip
D
Douwe Maan 已提交
165
    @merge_request = ::MergeRequests::UpdateService
F
Fatih Acet 已提交
166 167
      .new(project, current_user, wip_event: 'unwip')
      .execute(@merge_request)
168

169
    render json: serialize_widget(@merge_request)
170 171
  end

F
Fatih Acet 已提交
172 173
  def commit_change_content
    render partial: 'projects/merge_requests/widget/commit_change_content', layout: false
V
Valery Sizov 已提交
174 175
  end

S
Shinya Maeda 已提交
176 177
  def cancel_auto_merge
    unless @merge_request.can_cancel_auto_merge?(current_user)
178 179
      return access_denied!
    end
Z
Zeger-Jan van de Weg 已提交
180

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

183
    render json: serialize_widget(@merge_request)
Z
Zeger-Jan van de Weg 已提交
184 185
  end

186
  def merge
187 188 189
    access_check_result = merge_access_check

    return access_check_result if access_check_result
190

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

F
Fatih Acet 已提交
193 194
    if @merge_request.merge_error
      render json: { status: status, merge_error: @merge_request.merge_error }
195
    else
F
Fatih Acet 已提交
196
      render json: { status: status }
197
    end
R
randx 已提交
198 199
  end

200
  def assign_related_issues
D
Douwe Maan 已提交
201
    result = ::MergeRequests::AssignIssuesService.new(project, current_user, merge_request: @merge_request).execute
202

D
Douwe Maan 已提交
203 204 205 206 207 208 209
    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"
210
    end
D
Douwe Maan 已提交
211 212

    redirect_to(merge_request_path(@merge_request))
213 214
  end

215
  def pipeline_status
216
    render json: PipelineSerializer
F
Fatih Acet 已提交
217
      .new(project: @project, current_user: @current_user)
218
      .represent_status(head_pipeline)
219 220
  end

221
  def ci_environments_status
222 223 224 225 226 227 228 229 230 231
    environments =
      if ci_environments_status_on_merge_result?
        if Feature.enabled?(:deployment_merge_requests_widget, @project)
          EnvironmentStatus.for_deployed_merge_request(@merge_request, current_user)
        else
          EnvironmentStatus.after_merge_request(@merge_request, current_user)
        end
      else
        EnvironmentStatus.for_merge_request(@merge_request, current_user)
      end
232

233
    render json: EnvironmentStatusSerializer.new(current_user: current_user).represent(environments)
234 235
  end

236
  def rebase
237
    @merge_request.rebase_async(current_user.id)
238

239
    head :ok
240 241
  rescue MergeRequest::RebaseLockTimeout => e
    render json: { merge_error: e.message }, status: :conflict
242 243
  end

244
  def discussions
245
    merge_request.discussions_diffs.load_highlight
246 247 248 249

    super
  end

D
Dmitriy Zaporozhets 已提交
250 251
  protected

252
  alias_method :subscribable_resource, :merge_request
253
  alias_method :issuable, :merge_request
254
  alias_method :awardable, :merge_request
D
Dmitriy Zaporozhets 已提交
255

G
George Koltsov 已提交
256
  def sorting_field
257 258 259
    MergeRequest::SORTING_PREFERENCE_FIELD
  end

Z
Zeger-Jan van de Weg 已提交
260
  def merge_params
261 262 263 264
    params.permit(merge_params_attributes)
  end

  def merge_params_attributes
265
    MergeRequest::KNOWN_MERGE_PARAMS
Z
Zeger-Jan van de Weg 已提交
266 267
  end

S
Shinya Maeda 已提交
268 269 270
  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?
271
  end
S
Sean McGivern 已提交
272

F
Fatih Acet 已提交
273 274
  private

275 276 277 278 279 280 281
  def head_pipeline
    strong_memoize(:head_pipeline) do
      pipeline = @merge_request.head_pipeline
      pipeline if can?(current_user, :read_pipeline, pipeline)
    end
  end

282 283 284 285
  def ci_environments_status_on_merge_result?
    params[:environment_target] == 'merge_commit'
  end

286 287 288 289
  def target_branch_missing?
    @merge_request.has_no_commits? && !@merge_request.target_branch_exists?
  end

F
Fatih Acet 已提交
290
  def merge!
S
Shinya Maeda 已提交
291
    # Disable the CI check if auto_merge_strategy is specified since we have
F
Fatih Acet 已提交
292
    # to wait until CI completes to know
S
Shinya Maeda 已提交
293
    unless @merge_request.mergeable?(skip_ci_check: auto_merge_requested?)
F
Fatih Acet 已提交
294 295 296
      return :failed
    end

297 298 299 300 301 302
    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 已提交
303 304
    return :sha_mismatch if params[:sha] != @merge_request.diff_head_sha

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

S
Shinya Maeda 已提交
307
    if auto_merge_requested?
308 309
      if merge_request.auto_merge_enabled?
        # TODO: We should have a dedicated endpoint for updating merge params.
310
        #       See https://gitlab.com/gitlab-org/gitlab-foss/issues/63130.
311 312 313 314 315 316
        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 已提交
317
    else
318
      @merge_request.merge_async(current_user.id, merge_params)
F
Fatih Acet 已提交
319 320 321 322 323

      :success
    end
  end

324 325 326 327
  def serialize_widget(merge_request)
    serializer.represent(merge_request, serializer: 'widget')
  end

F
Fatih Acet 已提交
328
  def serializer
329
    MergeRequestSerializer.new(current_user: current_user, project: merge_request.project)
F
Fatih Acet 已提交
330
  end
D
Douwe Maan 已提交
331 332 333 334 335

  def define_edit_vars
    @source_project = @merge_request.source_project
    @target_project = @merge_request.target_project
    @target_branches = @merge_request.target_project.repository.branch_names
A
Alin Ciciu 已提交
336
    @noteable = @merge_request
T
Tiago Botelho 已提交
337 338 339

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

343 344
  def finder_type
    MergeRequestsFinder
J
Jarka Kadlecova 已提交
345
  end
346 347 348 349 350 351 352 353 354 355

  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
356

357 358 359 360
  def merge_access_check
    access_denied! unless @merge_request.can_be_merged_by?(current_user)
  end

361
  def whitelist_query_limiting
362 363
    # Also see https://gitlab.com/gitlab-org/gitlab-foss/issues/42441
    Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-foss/issues/42438')
364
  end
M
Matija Čupić 已提交
365 366 367 368 369 370 371 372 373 374 375 376

  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
377
      raise "Failed to build comparison response as comparison yielded unknown status '#{report_comparison[:status]}'"
M
Matija Čupić 已提交
378 379
    end
  end
380

381
  def authorize_read_actual_head_pipeline!
382 383
    return render_404 unless can?(current_user, :read_build, merge_request.actual_head_pipeline)
  end
D
Dmitriy Zaporozhets 已提交
384
end
385 386

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