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

3
class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationController
4
  include ToggleSubscriptionAction
5
  include IssuableActions
Douwe Maan's avatar
Douwe Maan committed
6
  include RendersNotes
7
  include RendersCommits
8
  include ToggleAwardEmoji
9
  include IssuableCollections
10
  include RecordUserLastActivity
11

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]
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

Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
21
  def index
22
    @merge_requests = @issuables
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
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
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|
Fatih Acet's avatar
Fatih Acet committed
39
      format.html do
40 41 42
        # use next to appease Rubocop
        next render('invalid') if target_branch_missing?

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')
49 50

        set_pipeline_variables
51

52
        render
Fatih Acet's avatar
Fatih Acet committed
53
      end
54

Douwe Maan's avatar
Douwe Maan committed
55
      format.json do
56 57
        Gitlab::PollingInterval.set_header(response, interval: 10_000)

Eric Eastwood's avatar
Eric Eastwood committed
58
        render json: serializer.represent(@merge_request, serializer: params[:serializer])
Douwe Maan's avatar
Douwe Maan committed
59 60
      end

61
      format.patch do
62
        break render_404 unless @merge_request.diff_refs
Douwe Maan's avatar
Douwe Maan committed
63 64

        send_git_patch @project.repository, @merge_request.diff_refs
65
      end
Douwe Maan's avatar
Douwe Maan committed
66

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

Douwe Maan's avatar
Douwe Maan committed
70
        send_git_diff @project.repository, @merge_request.diff_refs
71
      end
72
    end
randx's avatar
randx committed
73 74
  end

75
  def commits
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

81
    render json: { html: view_to_html_string('projects/merge_requests/_commits') }
82 83
  end

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

88
    Gitlab::PollingInterval.set_header(response, interval: 10_000)
89

90 91 92
    render json: {
      pipelines: PipelineSerializer
        .new(project: @project, current_user: @current_user)
93
        .with_pagination(request, response)
94 95 96 97 98
        .represent(@pipelines),
      count: {
        all: @pipelines.count
      }
    }
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
99 100
  end

101
  def test_reports
Matija Čupić's avatar
Matija Čupić committed
102
    reports_response(@merge_request.compare_test_reports)
103 104
  end

105
  def edit
106
    define_edit_vars
107 108
  end

Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
109
  def update
110
    @merge_request = ::MergeRequests::UpdateService.new(project, current_user, merge_request_params).execute(@merge_request)
111

112 113
    respond_to do |format|
      format.html do
114
        if @merge_request.errors.present?
115 116
          define_edit_vars

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

      format.json do
124 125 126 127 128
        if merge_request.errors.present?
          render json: @merge_request.errors, status: :bad_request
        else
          render json: serializer.represent(@merge_request, serializer: 'basic')
        end
129
      end
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
130
    end
131
  rescue ActiveRecord::StaleObjectError
132 133
    define_edit_vars if request.format.html?

134
    render_conflict_response
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
135 136
  end

137
  def remove_wip
138
    @merge_request = ::MergeRequests::UpdateService
Fatih Acet's avatar
Fatih Acet committed
139 140
      .new(project, current_user, wip_event: 'unwip')
      .execute(@merge_request)
141

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

Fatih Acet's avatar
Fatih Acet committed
145 146
  def commit_change_content
    render partial: 'projects/merge_requests/widget/commit_change_content', layout: false
Valery Sizov's avatar
Valery Sizov committed
147 148
  end

149 150
  def cancel_auto_merge
    unless @merge_request.can_cancel_auto_merge?(current_user)
151 152
      return access_denied!
    end
153

154
    AutoMergeService.new(project, current_user).cancel(@merge_request)
Fatih Acet's avatar
Fatih Acet committed
155

156
    render json: serialize_widget(@merge_request)
157 158
  end

159
  def merge
160 161 162
    access_check_result = merge_access_check

    return access_check_result if access_check_result
163

Fatih Acet's avatar
Fatih Acet committed
164
    status = merge!
165

Fatih Acet's avatar
Fatih Acet committed
166 167
    if @merge_request.merge_error
      render json: { status: status, merge_error: @merge_request.merge_error }
168
    else
Fatih Acet's avatar
Fatih Acet committed
169
      render json: { status: status }
170
    end
randx's avatar
randx committed
171 172
  end

173
  def assign_related_issues
174
    result = ::MergeRequests::AssignIssuesService.new(project, current_user, merge_request: @merge_request).execute
175

176 177 178 179 180 181 182
    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"
183
    end
184 185

    redirect_to(merge_request_path(@merge_request))
186 187
  end

188
  def pipeline_status
189
    render json: PipelineSerializer
Fatih Acet's avatar
Fatih Acet committed
190
      .new(project: @project, current_user: @current_user)
Shinya Maeda's avatar
Shinya Maeda committed
191
      .represent_status(@merge_request.head_pipeline)
192 193
  end

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

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

204
  def rebase
205
    @merge_request.rebase_async(current_user.id)
206

207
    head :ok
208 209
  end

210 211 212 213 214 215
  def discussions
    merge_request.preload_discussions_diff_highlight

    super
  end

Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
216 217
  protected

218
  alias_method :subscribable_resource, :merge_request
219
  alias_method :issuable, :merge_request
220
  alias_method :awardable, :merge_request
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
221

222
  def sorting_field
223 224 225
    MergeRequest::SORTING_PREFERENCE_FIELD
  end

226
  def merge_params
227 228 229 230
    params.permit(merge_params_attributes)
  end

  def merge_params_attributes
231
    [:should_remove_source_branch, :commit_message, :squash_commit_message, :squash, :auto_merge_strategy]
232 233
  end

234 235 236
  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?
237
  end
238

Fatih Acet's avatar
Fatih Acet committed
239 240
  private

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

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

Fatih Acet's avatar
Fatih Acet committed
249
  def merge!
250
    # Disable the CI check if auto_merge_strategy is specified since we have
Fatih Acet's avatar
Fatih Acet committed
251
    # to wait until CI completes to know
252
    unless @merge_request.mergeable?(skip_ci_check: auto_merge_requested?)
Fatih Acet's avatar
Fatih Acet committed
253 254 255
      return :failed
    end

256 257 258 259 260 261
    merge_service = ::MergeRequests::MergeService.new(@project, current_user, merge_params)

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

Fatih Acet's avatar
Fatih Acet committed
262 263
    return :sha_mismatch if params[:sha] != @merge_request.diff_head_sha

264
    @merge_request.update(merge_error: nil, squash: merge_params.fetch(:squash, false))
Fatih Acet's avatar
Fatih Acet committed
265

266
    if auto_merge_requested?
267 268 269 270 271 272 273 274 275
      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
Fatih Acet's avatar
Fatih Acet committed
276
    else
277
      @merge_request.merge_async(current_user.id, merge_params)
Fatih Acet's avatar
Fatih Acet committed
278 279 280 281 282

      :success
    end
  end

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

Fatih Acet's avatar
Fatih Acet committed
287
  def serializer
288
    MergeRequestSerializer.new(current_user: current_user, project: merge_request.project)
Fatih Acet's avatar
Fatih Acet committed
289
  end
290 291 292 293 294

  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
Alin Ciciu's avatar
Alin Ciciu committed
295
    @noteable = @merge_request
296 297 298

    # FIXME: We have to assign a presenter to another instance variable
    # due to class_name checks being made with issuable classes
299
    @mr_presenter = @merge_request.present(current_user: current_user)
300
  end
301

302 303
  def finder_type
    MergeRequestsFinder
304
  end
305 306 307 308 309 310 311 312 313 314

  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
315

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

320 321 322 323
  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
Matija Čupić's avatar
Matija Čupić committed
324 325 326 327 328 329 330 331 332 333 334 335 336 337 338

  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
Dmitriy Zaporozhets's avatar
Dmitriy Zaporozhets committed
339
end