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

F
Felipe Artur 已提交
45 46 47
        # TODO cleanup- Fatih Simon Create an issue to remove these after the refactoring
        # we no longer render notes here. I see it will require a small frontend refactoring,
        # since we gather some data from this collection.
48 49 50
        @discussions = @merge_request.discussions
        @notes = prepare_notes_for_rendering(@discussions.flat_map(&:notes), @noteable)

D
Douwe Maan 已提交
51 52 53
        labels

        set_pipeline_variables
54

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

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

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

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

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

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

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

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

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

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

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

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

D
Douwe Maan 已提交
102
  def edit
D
Douwe Maan 已提交
103
    define_edit_vars
D
Douwe Maan 已提交
104 105
  end

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

109 110 111 112 113
    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 已提交
114 115
          define_edit_vars

116
          render :edit
117
        end
118
      end
119 120

      format.json do
121
        render json: serializer.represent(@merge_request, serializer: 'basic')
122
      end
D
Dmitriy Zaporozhets 已提交
123
    end
124
  rescue ActiveRecord::StaleObjectError
D
Douwe Maan 已提交
125 126
    define_edit_vars if request.format.html?

127
    render_conflict_response
D
Dmitriy Zaporozhets 已提交
128 129
  end

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

135
    render json: serialize_widget(@merge_request)
136 137
  end

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

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

D
Douwe Maan 已提交
147
    ::MergeRequests::MergeWhenPipelineSucceedsService
D
Douwe Maan 已提交
148 149
      .new(@project, current_user)
      .cancel(@merge_request)
F
Fatih Acet 已提交
150

151
    render json: serialize_widget(@merge_request)
Z
Zeger-Jan van de Weg 已提交
152 153
  end

154
  def merge
155
    return access_denied! unless @merge_request.can_be_merged_by?(current_user)
156

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

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

166
  def assign_related_issues
D
Douwe Maan 已提交
167
    result = ::MergeRequests::AssignIssuesService.new(project, current_user, merge_request: @merge_request).execute
168

D
Douwe Maan 已提交
169 170 171 172 173 174 175
    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"
176
    end
D
Douwe Maan 已提交
177 178

    redirect_to(merge_request_path(@merge_request))
179 180
  end

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

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

K
Kamil Trzcinski 已提交
194
          stop_url =
195
            if can?(current_user, :stop_environment, environment)
196
              stop_project_environment_path(project, environment)
K
Kamil Trzcinski 已提交
197 198
            end

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

          metrics_monitoring_url =
205 206 207
            if can?(current_user, :read_environment, environment)
              environment_metrics_path(environment)
            end
F
Fatih Acet 已提交
208

Z
Z.J. van de Weg 已提交
209
          {
Z
Z.J. van de Weg 已提交
210
            id: environment.id,
Z
Z.J. van de Weg 已提交
211
            name: environment.name,
212
            url: project_environment_path(project, environment),
F
Fatih Acet 已提交
213
            metrics_url: metrics_url,
214
            metrics_monitoring_url: metrics_monitoring_url,
K
Kamil Trzcinski 已提交
215
            stop_url: stop_url,
Z
Z.J. van de Weg 已提交
216
            external_url: environment.external_url,
Z
Z.J. van de Weg 已提交
217 218 219
            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 已提交
220 221
          }
        end.compact
222
      end
223

Z
Z.J. van de Weg 已提交
224
    render json: environments
225 226
  end

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

L
Lin Jen-Shin 已提交
230
    render nothing: true, status: :ok
231 232
  end

D
Dmitriy Zaporozhets 已提交
233 234
  protected

235
  alias_method :subscribable_resource, :merge_request
236
  alias_method :issuable, :merge_request
237
  alias_method :awardable, :merge_request
D
Dmitriy Zaporozhets 已提交
238

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

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

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

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

  private

260 261 262 263
  def target_branch_missing?
    @merge_request.has_no_commits? && !@merge_request.target_branch_exists?
  end

264
  def mark_merge_request_mergeable
265 266 267
    @merge_request.check_if_can_be_merged
  end

F
Fatih Acet 已提交
268 269 270 271 272 273 274 275 276
  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

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

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

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

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

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

      :success
    end
  end

304 305 306 307
  def serialize_widget(merge_request)
    serializer.represent(merge_request, serializer: 'widget')
  end

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

  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 已提交
317

318 319
  def finder_type
    MergeRequestsFinder
J
Jarka Kadlecova 已提交
320
  end
321 322 323 324 325 326 327 328 329 330

  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
331 332 333 334 335

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