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

D
Douwe Maan 已提交
11
  skip_before_action :merge_request, only: [:index, :bulk_update]
12
  before_action :whitelist_query_limiting, only: [:assign_related_issues, :update]
13
  before_action :authorize_update_issuable!, only: [:close, :edit, :update, :remove_wip, :sort]
J
Jarka Kadlecova 已提交
14
  before_action :set_issuables_index, only: [:index]
15
  before_action :authenticate_user!, only: [:assign_related_issues]
16
  before_action :check_user_can_push_to_source_branch!, only: [:rebase]
F
Filipa Lacerda 已提交
17 18 19
  before_action do
    push_frontend_feature_flag(:ci_environments_status_changes)
  end
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"),
P
Phil Hughes 已提交
29
          labels: @labels.as_json(methods: :text_color)
30 31 32
        }
      end
    end
D
Dmitriy Zaporozhets 已提交
33 34 35
  end

  def show
36
    close_merge_request_if_no_source_project
37
    mark_merge_request_mergeable
38

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

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

        @noteable = @merge_request
        @commits_count = @merge_request.commits_count

        labels

        set_pipeline_variables
53

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

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

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

Z
Z.J. van de Weg 已提交
63
      format.patch  do
64
        break render_404 unless @merge_request.diff_refs
D
Douwe Maan 已提交
65 66

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

69
      format.diff do
70
        break render_404 unless @merge_request.diff_refs
71

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

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

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

86
  def pipelines
87
    @pipelines = @merge_request.all_pipelines
88

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

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

S
Shinya Maeda 已提交
101 102 103 104 105
  def test_reports
    result = @merge_request.compare_test_reports

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

S
Shinya Maeda 已提交
108 109
      render json: '', status: :no_content
    when :parsed
110
      render json: result[:data].to_json, status: :ok
S
Shinya Maeda 已提交
111 112 113 114 115 116 117
    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 已提交
118
  def edit
D
Douwe Maan 已提交
119
    define_edit_vars
D
Douwe Maan 已提交
120 121
  end

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

125 126 127 128 129
    respond_to do |format|
      format.html do
        if @merge_request.valid?
          redirect_to([@merge_request.target_project.namespace.becomes(Namespace), @merge_request.target_project, @merge_request])
        else
D
Douwe Maan 已提交
130 131
          define_edit_vars

132
          render :edit
133
        end
134
      end
135 136

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

143
    render_conflict_response
D
Dmitriy Zaporozhets 已提交
144 145
  end

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

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

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

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

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

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

170
  def merge
171
    return access_denied! unless @merge_request.can_be_merged_by?(current_user)
172

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

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

182
  def assign_related_issues
D
Douwe Maan 已提交
183
    result = ::MergeRequests::AssignIssuesService.new(project, current_user, merge_request: @merge_request).execute
184

D
Douwe Maan 已提交
185 186 187 188 189 190 191
    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"
192
    end
D
Douwe Maan 已提交
193 194

    redirect_to(merge_request_path(@merge_request))
195 196
  end

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

203
  def ci_environments_status
204 205 206
    environments = @merge_request.environments_for(current_user).map do |environment|
      EnvironmentStatus.new(environment, @merge_request)
    end
207

208
    render json: EnvironmentStatusSerializer.new(current_user: current_user).represent(environments)
209 210
  end

211 212 213
  def rebase
    RebaseWorker.perform_async(@merge_request.id, current_user.id)

L
Lin Jen-Shin 已提交
214
    render nothing: true, status: :ok
215 216
  end

D
Dmitriy Zaporozhets 已提交
217 218
  protected

219
  alias_method :subscribable_resource, :merge_request
220
  alias_method :issuable, :merge_request
221
  alias_method :awardable, :merge_request
D
Dmitriy Zaporozhets 已提交
222

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

  def merge_params_attributes
228
    [:should_remove_source_branch, :commit_message, :squash]
Z
Zeger-Jan van de Weg 已提交
229 230
  end

J
James Lopez 已提交
231 232
  def merge_when_pipeline_succeeds_active?
    params[:merge_when_pipeline_succeeds].present? &&
233
      @merge_request.head_pipeline && @merge_request.head_pipeline.active?
234
  end
S
Sean McGivern 已提交
235

236
  def close_merge_request_if_no_source_project
237 238 239 240
    if !@merge_request.source_project && @merge_request.open?
      @merge_request.close
    end
  end
F
Fatih Acet 已提交
241 242 243

  private

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

248
  def mark_merge_request_mergeable
249 250 251
    @merge_request.check_if_can_be_merged
  end

F
Fatih Acet 已提交
252 253 254 255 256 257 258 259 260
  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

    return :sha_mismatch if params[:sha] != @merge_request.diff_head_sha

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

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

266
      if @merge_request.actual_head_pipeline.active?
D
Douwe Maan 已提交
267
        ::MergeRequests::MergeWhenPipelineSucceedsService
F
Fatih Acet 已提交
268 269 270 271
          .new(@project, current_user, merge_params)
          .execute(@merge_request)

        :merge_when_pipeline_succeeds
272
      elsif @merge_request.actual_head_pipeline.success?
F
Fatih Acet 已提交
273 274
        # This can be triggered when a user clicks the auto merge button while
        # the tests finish at about the same time
275
        @merge_request.merge_async(current_user.id, merge_params)
F
Fatih Acet 已提交
276 277 278 279 280 281

        :success
      else
        :failed
      end
    else
282
      @merge_request.merge_async(current_user.id, merge_params)
F
Fatih Acet 已提交
283 284 285 286 287

      :success
    end
  end

288 289 290 291
  def serialize_widget(merge_request)
    serializer.represent(merge_request, serializer: 'widget')
  end

F
Fatih Acet 已提交
292 293 294
  def serializer
    MergeRequestSerializer.new(current_user: current_user, project: merge_request.project)
  end
D
Douwe Maan 已提交
295 296 297 298 299

  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 已提交
300
    @noteable = @merge_request
T
Tiago Botelho 已提交
301 302 303

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

307 308
  def finder_type
    MergeRequestsFinder
J
Jarka Kadlecova 已提交
309
  end
310 311 312 313 314 315 316 317 318 319

  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
320 321 322 323 324

  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 已提交
325
end