merge_requests_controller.rb 9.7 KB
Newer Older
D
Douwe Maan 已提交
1
class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationController
2
  include ToggleSubscriptionAction
3
  include IssuableActions
D
Douwe Maan 已提交
4
  include RendersNotes
5
  include RendersCommits
6
  include ToggleAwardEmoji
7
  include IssuableCollections
J
Jacob Vosmaer 已提交
8

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

D
Dmitriy Zaporozhets 已提交
16
  def index
J
Jarka Kadlecova 已提交
17
    @merge_requests = @issuables
C
Clement Ho 已提交
18

19 20 21 22
    respond_to do |format|
      format.html
      format.json do
        render json: {
23
          html: view_to_html_string("projects/merge_requests/_merge_requests"),
P
Phil Hughes 已提交
24
          labels: @labels.as_json(methods: :text_color)
25 26 27
        }
      end
    end
D
Dmitriy Zaporozhets 已提交
28 29 30
  end

  def show
31
    close_merge_request_if_no_source_project
32
    mark_merge_request_mergeable
33

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

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

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

45 46 47
        @discussions = @merge_request.discussions
        @notes = prepare_notes_for_rendering(@discussions.flat_map(&:notes), @noteable)

D
Douwe Maan 已提交
48 49 50
        labels

        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

Z
Z.J. van de Weg 已提交
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 79
    @commits =
      prepare_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
86

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

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

D
Douwe Maan 已提交
99
  def edit
D
Douwe Maan 已提交
100
    define_edit_vars
D
Douwe Maan 已提交
101 102
  end

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

106 107 108 109 110
    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 已提交
111 112
          define_edit_vars

113
          render :edit
114
        end
115
      end
116 117

      format.json do
118
        render json: @merge_request.to_json(include: { milestone: {}, assignee: { only: [:name, :username], methods: [:avatar_url] }, labels: { methods: :text_color } }, methods: [:task_status, :task_status_short])
119
      end
D
Dmitriy Zaporozhets 已提交
120
    end
121
  rescue ActiveRecord::StaleObjectError
D
Douwe Maan 已提交
122 123
    define_edit_vars if request.format.html?

124
    render_conflict_response
D
Dmitriy Zaporozhets 已提交
125 126
  end

127
  def remove_wip
D
Douwe Maan 已提交
128
    @merge_request = ::MergeRequests::UpdateService
F
Fatih Acet 已提交
129 130
      .new(project, current_user, wip_event: 'unwip')
      .execute(@merge_request)
131

132
    render json: serialize_widget(@merge_request)
133 134
  end

F
Fatih Acet 已提交
135 136
  def commit_change_content
    render partial: 'projects/merge_requests/widget/commit_change_content', layout: false
V
Valery Sizov 已提交
137 138
  end

J
James Lopez 已提交
139 140
  def cancel_merge_when_pipeline_succeeds
    unless @merge_request.can_cancel_merge_when_pipeline_succeeds?(current_user)
141 142
      return access_denied!
    end
Z
Zeger-Jan van de Weg 已提交
143

D
Douwe Maan 已提交
144
    ::MergeRequests::MergeWhenPipelineSucceedsService
D
Douwe Maan 已提交
145 146
      .new(@project, current_user)
      .cancel(@merge_request)
F
Fatih Acet 已提交
147

148
    render json: serialize_widget(@merge_request)
Z
Zeger-Jan van de Weg 已提交
149 150
  end

151
  def merge
152
    return access_denied! unless @merge_request.can_be_merged_by?(current_user)
153

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

F
Fatih Acet 已提交
156 157
    if @merge_request.merge_error
      render json: { status: status, merge_error: @merge_request.merge_error }
158
    else
F
Fatih Acet 已提交
159
      render json: { status: status }
160
    end
R
randx 已提交
161 162
  end

163
  def assign_related_issues
D
Douwe Maan 已提交
164
    result = ::MergeRequests::AssignIssuesService.new(project, current_user, merge_request: @merge_request).execute
165

D
Douwe Maan 已提交
166 167 168 169 170 171 172
    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"
173
    end
D
Douwe Maan 已提交
174 175

    redirect_to(merge_request_path(@merge_request))
176 177
  end

178
  def pipeline_status
179
    render json: PipelineSerializer
F
Fatih Acet 已提交
180
      .new(project: @project, current_user: @current_user)
S
Shinya Maeda 已提交
181
      .represent_status(@merge_request.head_pipeline)
182 183
  end

184
  def ci_environments_status
Z
Z.J. van de Weg 已提交
185
    environments =
Z
Z.J. van de Weg 已提交
186
      begin
D
Douwe Maan 已提交
187
        @merge_request.environments_for(current_user).map do |environment|
Z
Z.J. van de Weg 已提交
188
          project = environment.project
189
          deployment = environment.first_deployment_for(@merge_request.diff_head_sha)
Z
Z.J. van de Weg 已提交
190

K
Kamil Trzcinski 已提交
191
          stop_url =
K
Kamil Trzcinski 已提交
192
            if environment.stop_action? && can?(current_user, :create_deployment, environment)
193
              stop_project_environment_path(project, environment)
K
Kamil Trzcinski 已提交
194 195
            end

F
Fatih Acet 已提交
196 197
          metrics_url =
            if can?(current_user, :read_environment, environment) && environment.has_metrics?
198
              metrics_project_environment_deployment_path(environment.project, environment, deployment)
F
Fatih Acet 已提交
199
            end
200 201

          metrics_monitoring_url =
202 203 204
            if can?(current_user, :read_environment, environment)
              environment_metrics_path(environment)
            end
F
Fatih Acet 已提交
205

Z
Z.J. van de Weg 已提交
206
          {
Z
Z.J. van de Weg 已提交
207
            id: environment.id,
Z
Z.J. van de Weg 已提交
208
            name: environment.name,
209
            url: project_environment_path(project, environment),
F
Fatih Acet 已提交
210
            metrics_url: metrics_url,
211
            metrics_monitoring_url: metrics_monitoring_url,
K
Kamil Trzcinski 已提交
212
            stop_url: stop_url,
Z
Z.J. van de Weg 已提交
213
            external_url: environment.external_url,
Z
Z.J. van de Weg 已提交
214 215 216
            external_url_formatted: environment.formatted_external_url,
            deployed_at: deployment.try(:created_at),
            deployed_at_formatted: deployment.try(:formatted_deployment_time)
Z
Z.J. van de Weg 已提交
217 218
          }
        end.compact
219
      end
220

Z
Z.J. van de Weg 已提交
221
    render json: environments
222 223
  end

224 225 226 227 228 229
  def rebase
    RebaseWorker.perform_async(@merge_request.id, current_user.id)

    render nothing: true, status: 200
  end

D
Dmitriy Zaporozhets 已提交
230 231
  protected

232
  alias_method :subscribable_resource, :merge_request
233
  alias_method :issuable, :merge_request
234
  alias_method :awardable, :merge_request
D
Dmitriy Zaporozhets 已提交
235

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

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

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

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

  private

257 258 259 260
  def target_branch_missing?
    @merge_request.has_no_commits? && !@merge_request.target_branch_exists?
  end

261
  def mark_merge_request_mergeable
262 263 264
    @merge_request.check_if_can_be_merged
  end

F
Fatih Acet 已提交
265 266 267 268 269 270 271 272 273
  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

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

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

279
      if @merge_request.actual_head_pipeline.active?
D
Douwe Maan 已提交
280
        ::MergeRequests::MergeWhenPipelineSucceedsService
F
Fatih Acet 已提交
281 282 283 284
          .new(@project, current_user, merge_params)
          .execute(@merge_request)

        :merge_when_pipeline_succeeds
285
      elsif @merge_request.actual_head_pipeline.success?
F
Fatih Acet 已提交
286 287
        # This can be triggered when a user clicks the auto merge button while
        # the tests finish at about the same time
288
        @merge_request.merge_async(current_user.id, merge_params)
F
Fatih Acet 已提交
289 290 291 292 293 294

        :success
      else
        :failed
      end
    else
295
      @merge_request.merge_async(current_user.id, merge_params)
F
Fatih Acet 已提交
296 297 298 299 300

      :success
    end
  end

301 302 303 304
  def serialize_widget(merge_request)
    serializer.represent(merge_request, serializer: 'widget')
  end

F
Fatih Acet 已提交
305 306 307
  def serializer
    MergeRequestSerializer.new(current_user: current_user, project: merge_request.project)
  end
D
Douwe Maan 已提交
308 309 310 311 312 313

  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
  end
J
Jarka Kadlecova 已提交
314

315 316
  def finder_type
    MergeRequestsFinder
J
Jarka Kadlecova 已提交
317
  end
318 319 320 321 322 323 324 325 326 327

  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
328 329 330 331 332

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