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

D
Douwe Maan 已提交
13
  skip_before_action :merge_request, only: [:index, :bulk_update]
14
  before_action :whitelist_query_limiting, only: [:assign_related_issues, :update]
15
  before_action :authorize_update_issuable!, only: [:close, :edit, :update, :remove_wip, :sort]
16
  before_action :authorize_read_actual_head_pipeline!, only: [:test_reports, :exposed_artifacts]
J
Jarka Kadlecova 已提交
17
  before_action :set_issuables_index, only: [:index]
18
  before_action :authenticate_user!, only: [:assign_related_issues]
19
  before_action :check_user_can_push_to_source_branch!, only: [:rebase]
20 21 22
  before_action only: [:show] do
    push_frontend_feature_flag(:diffs_batch_load, @project)
  end
23

24 25
  before_action do
    push_frontend_feature_flag(:vue_issuable_sidebar, @project.group)
26
    push_frontend_feature_flag(:release_search_filter, @project)
27 28
  end

29
  around_action :allow_gitaly_ref_name_caching, only: [:index, :show, :discussions]
30

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

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

  def show
45
    close_merge_request_if_no_source_project
46
    @merge_request.check_mergeability
47

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

53 54
        preload_assignees_for_render(@merge_request)

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

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

        set_pipeline_variables
65

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

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

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

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

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

81
      format.diff do
82
        break render_404 unless @merge_request.diff_refs
83

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

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

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

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

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

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

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

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

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

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

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

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

159
    render_conflict_response
D
Dmitriy Zaporozhets 已提交
160 161
  end

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

167
    render json: serialize_widget(@merge_request)
168 169
  end

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

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

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

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

184
  def merge
185 186 187
    access_check_result = merge_access_check

    return access_check_result if access_check_result
188

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

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

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

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

    redirect_to(merge_request_path(@merge_request))
211 212
  end

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

219
  def ci_environments_status
220 221 222 223 224
    environments = if ci_environments_status_on_merge_result?
                     EnvironmentStatus.after_merge_request(@merge_request, current_user)
                   else
                     EnvironmentStatus.for_merge_request(@merge_request, current_user)
                   end
225

226
    render json: EnvironmentStatusSerializer.new(current_user: current_user).represent(environments)
227 228
  end

229
  def rebase
230
    @merge_request.rebase_async(current_user.id)
231

232
    head :ok
233 234
  rescue MergeRequest::RebaseLockTimeout => e
    render json: { merge_error: e.message }, status: :conflict
235 236
  end

237
  def discussions
238
    merge_request.discussions_diffs.load_highlight
239 240 241 242

    super
  end

D
Dmitriy Zaporozhets 已提交
243 244
  protected

245
  alias_method :subscribable_resource, :merge_request
246
  alias_method :issuable, :merge_request
247
  alias_method :awardable, :merge_request
D
Dmitriy Zaporozhets 已提交
248

G
George Koltsov 已提交
249
  def sorting_field
250 251 252
    MergeRequest::SORTING_PREFERENCE_FIELD
  end

Z
Zeger-Jan van de Weg 已提交
253
  def merge_params
254 255 256 257
    params.permit(merge_params_attributes)
  end

  def merge_params_attributes
258
    MergeRequest::KNOWN_MERGE_PARAMS
Z
Zeger-Jan van de Weg 已提交
259 260
  end

S
Shinya Maeda 已提交
261 262 263
  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?
264
  end
S
Sean McGivern 已提交
265

F
Fatih Acet 已提交
266 267
  private

268 269 270 271 272 273 274
  def head_pipeline
    strong_memoize(:head_pipeline) do
      pipeline = @merge_request.head_pipeline
      pipeline if can?(current_user, :read_pipeline, pipeline)
    end
  end

275 276 277 278
  def ci_environments_status_on_merge_result?
    params[:environment_target] == 'merge_commit'
  end

279 280 281 282
  def target_branch_missing?
    @merge_request.has_no_commits? && !@merge_request.target_branch_exists?
  end

F
Fatih Acet 已提交
283
  def merge!
S
Shinya Maeda 已提交
284
    # Disable the CI check if auto_merge_strategy is specified since we have
F
Fatih Acet 已提交
285
    # to wait until CI completes to know
S
Shinya Maeda 已提交
286
    unless @merge_request.mergeable?(skip_ci_check: auto_merge_requested?)
F
Fatih Acet 已提交
287 288 289
      return :failed
    end

290 291 292 293 294 295
    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 已提交
296 297
    return :sha_mismatch if params[:sha] != @merge_request.diff_head_sha

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

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

      :success
    end
  end

317 318 319 320
  def serialize_widget(merge_request)
    serializer.represent(merge_request, serializer: 'widget')
  end

F
Fatih Acet 已提交
321
  def serializer
322
    MergeRequestSerializer.new(current_user: current_user, project: merge_request.project)
F
Fatih Acet 已提交
323
  end
D
Douwe Maan 已提交
324 325 326 327 328

  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 已提交
329
    @noteable = @merge_request
T
Tiago Botelho 已提交
330 331 332

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

336 337
  def finder_type
    MergeRequestsFinder
J
Jarka Kadlecova 已提交
338
  end
339 340 341 342 343 344 345 346 347 348

  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
349

350 351 352 353
  def merge_access_check
    access_denied! unless @merge_request.can_be_merged_by?(current_user)
  end

354
  def whitelist_query_limiting
355 356
    # Also see https://gitlab.com/gitlab-org/gitlab-foss/issues/42441
    Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-foss/issues/42438')
357
  end
M
Matija Čupić 已提交
358 359 360 361 362 363 364 365 366 367 368 369

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

374
  def authorize_read_actual_head_pipeline!
375 376
    return render_404 unless can?(current_user, :read_build, merge_request.actual_head_pipeline)
  end
D
Dmitriy Zaporozhets 已提交
377
end
378 379

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