merge_requests_controller.rb 9.7 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 ToggleAwardEmoji
9
  include IssuableCollections
10
  include RecordUserLastActivity
J
Jacob Vosmaer 已提交
11

D
Douwe Maan 已提交
12
  skip_before_action :merge_request, only: [:index, :bulk_update]
13
  before_action :whitelist_query_limiting, only: [:assign_related_issues, :update]
14
  before_action :authorize_update_issuable!, only: [:close, :edit, :update, :remove_wip, :sort]
J
Jarka Kadlecova 已提交
15
  before_action :set_issuables_index, only: [:index]
16
  before_action :authenticate_user!, only: [:assign_related_issues]
17
  before_action :check_user_can_push_to_source_branch!, only: [:rebase]
18

19
  around_action :allow_gitaly_ref_name_caching, only: [:index, :show, :discussions]
20

D
Dmitriy Zaporozhets 已提交
21
  def index
J
Jarka Kadlecova 已提交
22
    @merge_requests = @issuables
C
Clement Ho 已提交
23

24 25 26 27
    respond_to do |format|
      format.html
      format.json do
        render json: {
28
          html: view_to_html_string("projects/merge_requests/_merge_requests")
29 30 31
        }
      end
    end
D
Dmitriy Zaporozhets 已提交
32 33 34
  end

  def show
35
    close_merge_request_if_no_source_project
36
    @merge_request.check_mergeability
37

38
    respond_to do |format|
F
Fatih Acet 已提交
39
      format.html do
40 41 42
        # use next to appease Rubocop
        next render('invalid') if target_branch_missing?

D
Douwe Maan 已提交
43 44 45 46 47
        # Build a note object for comment form
        @note = @project.notes.new(noteable: @merge_request)

        @noteable = @merge_request
        @commits_count = @merge_request.commits_count
48
        @issuable_sidebar = serializer.represent(@merge_request, serializer: 'sidebar')
D
Douwe Maan 已提交
49 50

        set_pipeline_variables
51

Z
Zeger-Jan van de Weg 已提交
52
        render
F
Fatih Acet 已提交
53
      end
S
Sean McGivern 已提交
54

D
Douwe Maan 已提交
55
      format.json do
56 57
        Gitlab::PollingInterval.set_header(response, interval: 10_000)

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

61
      format.patch do
62
        break render_404 unless @merge_request.diff_refs
D
Douwe Maan 已提交
63 64

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

67
      format.diff do
68
        break render_404 unless @merge_request.diff_refs
69

D
Douwe Maan 已提交
70
        send_git_diff @project.repository, @merge_request.diff_refs
71
      end
72
    end
R
randx 已提交
73 74
  end

75
  def commits
D
Douwe Maan 已提交
76 77
    # Get commits from repository
    # or from cache if already merged
78
    @commits =
79
      set_commits_for_rendering(@merge_request.commits.with_pipeline_status)
80

D
Douwe Maan 已提交
81
    render json: { html: view_to_html_string('projects/merge_requests/_commits') }
82 83
  end

84
  def pipelines
85
    @pipelines = @merge_request.all_pipelines.page(params[:page]).per(30)
86

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

89 90 91
    render json: {
      pipelines: PipelineSerializer
        .new(project: @project, current_user: @current_user)
92
        .with_pagination(request, response)
93 94 95 96 97
        .represent(@pipelines),
      count: {
        all: @pipelines.count
      }
    }
D
Dmitriy Zaporozhets 已提交
98 99
  end

S
Shinya Maeda 已提交
100
  def test_reports
M
Matija Čupić 已提交
101
    reports_response(@merge_request.compare_test_reports)
S
Shinya Maeda 已提交
102 103
  end

D
Douwe Maan 已提交
104
  def edit
D
Douwe Maan 已提交
105
    define_edit_vars
D
Douwe Maan 已提交
106 107
  end

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

111 112
    respond_to do |format|
      format.html do
113
        if @merge_request.errors.present?
D
Douwe Maan 已提交
114 115
          define_edit_vars

116
          render :edit
117 118
        else
          redirect_to project_merge_request_path(@merge_request.target_project, @merge_request)
119
        end
120
      end
121 122

      format.json do
123 124 125 126 127
        if merge_request.errors.present?
          render json: @merge_request.errors, status: :bad_request
        else
          render json: serializer.represent(@merge_request, serializer: 'basic')
        end
128
      end
D
Dmitriy Zaporozhets 已提交
129
    end
130
  rescue ActiveRecord::StaleObjectError
D
Douwe Maan 已提交
131 132
    define_edit_vars if request.format.html?

133
    render_conflict_response
D
Dmitriy Zaporozhets 已提交
134 135
  end

136
  def remove_wip
D
Douwe Maan 已提交
137
    @merge_request = ::MergeRequests::UpdateService
F
Fatih Acet 已提交
138 139
      .new(project, current_user, wip_event: 'unwip')
      .execute(@merge_request)
140

141
    render json: serialize_widget(@merge_request)
142 143
  end

F
Fatih Acet 已提交
144 145
  def commit_change_content
    render partial: 'projects/merge_requests/widget/commit_change_content', layout: false
V
Valery Sizov 已提交
146 147
  end

S
Shinya Maeda 已提交
148 149
  def cancel_auto_merge
    unless @merge_request.can_cancel_auto_merge?(current_user)
150 151
      return access_denied!
    end
Z
Zeger-Jan van de Weg 已提交
152

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

155
    render json: serialize_widget(@merge_request)
Z
Zeger-Jan van de Weg 已提交
156 157
  end

158
  def merge
159 160 161
    access_check_result = merge_access_check

    return access_check_result if access_check_result
162

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

F
Fatih Acet 已提交
165 166
    if @merge_request.merge_error
      render json: { status: status, merge_error: @merge_request.merge_error }
167
    else
F
Fatih Acet 已提交
168
      render json: { status: status }
169
    end
R
randx 已提交
170 171
  end

172
  def assign_related_issues
D
Douwe Maan 已提交
173
    result = ::MergeRequests::AssignIssuesService.new(project, current_user, merge_request: @merge_request).execute
174

D
Douwe Maan 已提交
175 176 177 178 179 180 181
    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"
182
    end
D
Douwe Maan 已提交
183 184

    redirect_to(merge_request_path(@merge_request))
185 186
  end

187
  def pipeline_status
188
    render json: PipelineSerializer
F
Fatih Acet 已提交
189
      .new(project: @project, current_user: @current_user)
S
Shinya Maeda 已提交
190
      .represent_status(@merge_request.head_pipeline)
191 192
  end

193
  def ci_environments_status
194 195 196 197 198
    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
199

200
    render json: EnvironmentStatusSerializer.new(current_user: current_user).represent(environments)
201 202
  end

203 204 205
  def rebase
    RebaseWorker.perform_async(@merge_request.id, current_user.id)

206
    head :ok
207 208
  end

209 210 211 212 213 214
  def discussions
    merge_request.preload_discussions_diff_highlight

    super
  end

D
Dmitriy Zaporozhets 已提交
215 216
  protected

217
  alias_method :subscribable_resource, :merge_request
218
  alias_method :issuable, :merge_request
219
  alias_method :awardable, :merge_request
D
Dmitriy Zaporozhets 已提交
220

221 222 223 224
  def issuable_sorting_field
    MergeRequest::SORTING_PREFERENCE_FIELD
  end

Z
Zeger-Jan van de Weg 已提交
225
  def merge_params
226 227 228 229
    params.permit(merge_params_attributes)
  end

  def merge_params_attributes
S
Shinya Maeda 已提交
230
    [:should_remove_source_branch, :commit_message, :squash_commit_message, :squash, :auto_merge_strategy]
Z
Zeger-Jan van de Weg 已提交
231 232
  end

S
Shinya Maeda 已提交
233 234 235
  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?
236
  end
S
Sean McGivern 已提交
237

F
Fatih Acet 已提交
238 239
  private

240 241 242 243
  def ci_environments_status_on_merge_result?
    params[:environment_target] == 'merge_commit'
  end

244 245 246 247
  def target_branch_missing?
    @merge_request.has_no_commits? && !@merge_request.target_branch_exists?
  end

F
Fatih Acet 已提交
248
  def merge!
S
Shinya Maeda 已提交
249
    # Disable the CI check if auto_merge_strategy is specified since we have
F
Fatih Acet 已提交
250
    # to wait until CI completes to know
S
Shinya Maeda 已提交
251
    unless @merge_request.mergeable?(skip_ci_check: auto_merge_requested?)
F
Fatih Acet 已提交
252 253 254
      return :failed
    end

255 256 257 258 259 260
    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 已提交
261 262
    return :sha_mismatch if params[:sha] != @merge_request.diff_head_sha

263
    @merge_request.update(merge_error: nil, squash: merge_params.fetch(:squash, false))
F
Fatih Acet 已提交
264

S
Shinya Maeda 已提交
265
    if auto_merge_requested?
266 267 268 269 270 271 272 273 274
      if merge_request.auto_merge_enabled?
        # TODO: We should have a dedicated endpoint for updating merge params.
        #       See https://gitlab.com/gitlab-org/gitlab-ce/issues/63130.
        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 已提交
275
    else
276
      @merge_request.merge_async(current_user.id, merge_params)
F
Fatih Acet 已提交
277 278 279 280 281

      :success
    end
  end

282 283 284 285
  def serialize_widget(merge_request)
    serializer.represent(merge_request, serializer: 'widget')
  end

F
Fatih Acet 已提交
286
  def serializer
287
    MergeRequestSerializer.new(current_user: current_user, project: merge_request.project)
F
Fatih Acet 已提交
288
  end
D
Douwe Maan 已提交
289 290 291 292 293

  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 已提交
294
    @noteable = @merge_request
T
Tiago Botelho 已提交
295 296 297

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

301 302
  def finder_type
    MergeRequestsFinder
J
Jarka Kadlecova 已提交
303
  end
304 305 306 307 308 309 310 311 312 313

  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
314

315 316 317 318
  def merge_access_check
    access_denied! unless @merge_request.can_be_merged_by?(current_user)
  end

319 320 321 322
  def whitelist_query_limiting
    # Also see https://gitlab.com/gitlab-org/gitlab-ce/issues/42441
    Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/42438')
  end
M
Matija Čupić 已提交
323 324 325 326 327 328 329 330 331 332 333 334 335 336 337

  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
      render json: { status_reason: 'Unknown error' }, status: :internal_server_error
    end
  end
D
Dmitriy Zaporozhets 已提交
338
end