merge_requests_controller.rb 10.0 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

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

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

  def show
33
    close_merge_request_if_no_source_project
34
    mark_merge_request_mergeable
35

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

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

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

        set_pipeline_variables
49

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

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

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

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

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

65
      format.diff do
66
        break render_404 unless @merge_request.diff_refs
67

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

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

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

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

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

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

S
Shinya Maeda 已提交
98 99 100 101 102
  def test_reports
    result = @merge_request.compare_test_reports

    case result[:status]
    when :parsing
S
Shinya Maeda 已提交
103 104
      Gitlab::PollingInterval.set_header(response, interval: 3000)

S
Shinya Maeda 已提交
105 106
      render json: '', status: :no_content
    when :parsed
107
      render json: result[:data].to_json, status: :ok
S
Shinya Maeda 已提交
108 109 110 111 112 113 114
    when :error
      render json: { status_reason: result[:status_reason] }, status: :bad_request
    else
      render json: { status_reason: 'Unknown error' }, status: :internal_server_error
    end
  end

D
Douwe Maan 已提交
115
  def edit
D
Douwe Maan 已提交
116
    define_edit_vars
D
Douwe Maan 已提交
117 118
  end

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

122 123
    respond_to do |format|
      format.html do
124
        if @merge_request.errors.present?
D
Douwe Maan 已提交
125 126
          define_edit_vars

127
          render :edit
128 129
        else
          redirect_to project_merge_request_path(@merge_request.target_project, @merge_request)
130
        end
131
      end
132 133

      format.json do
134 135 136 137 138
        if merge_request.errors.present?
          render json: @merge_request.errors, status: :bad_request
        else
          render json: serializer.represent(@merge_request, serializer: 'basic')
        end
139
      end
D
Dmitriy Zaporozhets 已提交
140
    end
141
  rescue ActiveRecord::StaleObjectError
D
Douwe Maan 已提交
142 143
    define_edit_vars if request.format.html?

144
    render_conflict_response
D
Dmitriy Zaporozhets 已提交
145 146
  end

147
  def remove_wip
D
Douwe Maan 已提交
148
    @merge_request = ::MergeRequests::UpdateService
F
Fatih Acet 已提交
149 150
      .new(project, current_user, wip_event: 'unwip')
      .execute(@merge_request)
151

152
    render json: serialize_widget(@merge_request)
153 154
  end

F
Fatih Acet 已提交
155 156
  def commit_change_content
    render partial: 'projects/merge_requests/widget/commit_change_content', layout: false
V
Valery Sizov 已提交
157 158
  end

J
James Lopez 已提交
159 160
  def cancel_merge_when_pipeline_succeeds
    unless @merge_request.can_cancel_merge_when_pipeline_succeeds?(current_user)
161 162
      return access_denied!
    end
Z
Zeger-Jan van de Weg 已提交
163

D
Douwe Maan 已提交
164
    ::MergeRequests::MergeWhenPipelineSucceedsService
D
Douwe Maan 已提交
165 166
      .new(@project, current_user)
      .cancel(@merge_request)
F
Fatih Acet 已提交
167

168
    render json: serialize_widget(@merge_request)
Z
Zeger-Jan van de Weg 已提交
169 170
  end

171
  def merge
172 173 174
    access_check_result = merge_access_check

    return access_check_result if access_check_result
175

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

F
Fatih Acet 已提交
178 179
    if @merge_request.merge_error
      render json: { status: status, merge_error: @merge_request.merge_error }
180
    else
F
Fatih Acet 已提交
181
      render json: { status: status }
182
    end
R
randx 已提交
183 184
  end

185
  def assign_related_issues
D
Douwe Maan 已提交
186
    result = ::MergeRequests::AssignIssuesService.new(project, current_user, merge_request: @merge_request).execute
187

D
Douwe Maan 已提交
188 189 190 191 192 193 194
    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"
195
    end
D
Douwe Maan 已提交
196 197

    redirect_to(merge_request_path(@merge_request))
198 199
  end

200
  def pipeline_status
201
    render json: PipelineSerializer
F
Fatih Acet 已提交
202
      .new(project: @project, current_user: @current_user)
S
Shinya Maeda 已提交
203
      .represent_status(@merge_request.head_pipeline)
204 205
  end

206
  def ci_environments_status
207 208 209 210 211
    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
212

213
    render json: EnvironmentStatusSerializer.new(current_user: current_user).represent(environments)
214 215
  end

216 217 218
  def rebase
    RebaseWorker.perform_async(@merge_request.id, current_user.id)

219
    head :ok
220 221
  end

222 223 224 225 226 227
  def discussions
    merge_request.preload_discussions_diff_highlight

    super
  end

D
Dmitriy Zaporozhets 已提交
228 229
  protected

230
  alias_method :subscribable_resource, :merge_request
231
  alias_method :issuable, :merge_request
232
  alias_method :awardable, :merge_request
D
Dmitriy Zaporozhets 已提交
233

234 235 236 237
  def issuable_sorting_field
    MergeRequest::SORTING_PREFERENCE_FIELD
  end

Z
Zeger-Jan van de Weg 已提交
238
  def merge_params
239 240 241 242
    params.permit(merge_params_attributes)
  end

  def merge_params_attributes
243
    [:should_remove_source_branch, :commit_message, :squash_commit_message, :squash]
Z
Zeger-Jan van de Weg 已提交
244 245
  end

J
James Lopez 已提交
246 247
  def merge_when_pipeline_succeeds_active?
    params[:merge_when_pipeline_succeeds].present? &&
248
      @merge_request.head_pipeline && @merge_request.head_pipeline.active?
249
  end
S
Sean McGivern 已提交
250

251
  def close_merge_request_if_no_source_project
252 253 254 255
    if !@merge_request.source_project && @merge_request.open?
      @merge_request.close
    end
  end
F
Fatih Acet 已提交
256 257 258

  private

259 260 261 262
  def ci_environments_status_on_merge_result?
    params[:environment_target] == 'merge_commit'
  end

263 264 265 266
  def target_branch_missing?
    @merge_request.has_no_commits? && !@merge_request.target_branch_exists?
  end

267
  def mark_merge_request_mergeable
268 269 270
    @merge_request.check_if_can_be_merged
  end

F
Fatih Acet 已提交
271 272 273 274 275 276 277
  def merge!
    # Disable the CI check if merge_when_pipeline_succeeds is enabled since we have
    # to wait until CI completes to know
    unless @merge_request.mergeable?(skip_ci_check: merge_when_pipeline_succeeds_active?)
      return :failed
    end

278 279 280 281 282 283
    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 已提交
284 285
    return :sha_mismatch if params[:sha] != @merge_request.diff_head_sha

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

    if params[:merge_when_pipeline_succeeds].present?
289
      return :failed unless @merge_request.actual_head_pipeline
F
Fatih Acet 已提交
290

291
      if @merge_request.actual_head_pipeline.active?
D
Douwe Maan 已提交
292
        ::MergeRequests::MergeWhenPipelineSucceedsService
F
Fatih Acet 已提交
293 294 295 296
          .new(@project, current_user, merge_params)
          .execute(@merge_request)

        :merge_when_pipeline_succeeds
297
      elsif @merge_request.actual_head_pipeline.success?
F
Fatih Acet 已提交
298 299
        # This can be triggered when a user clicks the auto merge button while
        # the tests finish at about the same time
300
        @merge_request.merge_async(current_user.id, merge_params)
F
Fatih Acet 已提交
301 302 303 304 305 306

        :success
      else
        :failed
      end
    else
307
      @merge_request.merge_async(current_user.id, merge_params)
F
Fatih Acet 已提交
308 309 310 311 312

      :success
    end
  end

313 314 315 316
  def serialize_widget(merge_request)
    serializer.represent(merge_request, serializer: 'widget')
  end

F
Fatih Acet 已提交
317 318 319
  def serializer
    MergeRequestSerializer.new(current_user: current_user, project: merge_request.project)
  end
D
Douwe Maan 已提交
320 321 322 323 324

  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 已提交
325
    @noteable = @merge_request
T
Tiago Botelho 已提交
326 327 328

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

332 333
  def finder_type
    MergeRequestsFinder
J
Jarka Kadlecova 已提交
334
  end
335 336 337 338 339 340 341 342 343 344

  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
345

346 347 348 349
  def merge_access_check
    access_denied! unless @merge_request.can_be_merged_by?(current_user)
  end

350 351 352 353
  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
D
Dmitriy Zaporozhets 已提交
354
end