merge_requests.rb 17.6 KB
Newer Older
1
module API
2
  class MergeRequests < Grape::API
3 4
    include PaginationParams

5
    before { authenticate_non_get! }
6

7 8 9 10
    helpers ::Gitlab::IssuableMetadata

    helpers do
      def find_merge_requests(args = {})
11
        args = declared_params.merge(args)
12 13 14 15 16 17 18 19 20 21 22 23

        args[:milestone_title] = args.delete(:milestone)
        args[:label_name] = args.delete(:labels)

        merge_requests = MergeRequestsFinder.new(current_user, args).execute
                           .reorder(args[:order_by] => args[:sort])
        merge_requests = paginate(merge_requests)
                           .preload(:target_project)

        return merge_requests if args[:view] == 'simple'

        merge_requests
24
          .preload(:notes, :author, :assignee, :milestone, :latest_merge_request_diff, :labels, :timelogs)
25 26
      end

Tony Rom's avatar
Tony Rom committed
27 28 29
      def merge_request_pipelines_with_access
        authorize! :read_pipeline, user_project

30 31 32 33
        mr = find_merge_request_with_access(params[:merge_request_iid])
        mr.all_pipelines
      end

34 35 36 37 38 39 40 41 42 43 44 45 46 47
      params :merge_requests_params do
        optional :state, type: String, values: %w[opened closed merged all], default: 'all',
                         desc: 'Return opened, closed, merged, or all merge requests'
        optional :order_by, type: String, values: %w[created_at updated_at], default: 'created_at',
                            desc: 'Return merge requests ordered by `created_at` or `updated_at` fields.'
        optional :sort, type: String, values: %w[asc desc], default: 'desc',
                        desc: 'Return merge requests sorted in `asc` or `desc` order.'
        optional :milestone, type: String, desc: 'Return merge requests for a specific milestone'
        optional :labels, type: String, desc: 'Comma-separated list of label names'
        optional :created_after, type: DateTime, desc: 'Return merge requests created after the specified time'
        optional :created_before, type: DateTime, desc: 'Return merge requests created before the specified time'
        optional :view, type: String, values: %w[simple], desc: 'If simple, returns the `iid`, URL, title, description, and basic state of merge request'
        optional :author_id, type: Integer, desc: 'Return merge requests which are authored by the user with the given ID'
        optional :assignee_id, type: Integer, desc: 'Return merge requests which are assigned to the user with the given ID'
48
        optional :scope, type: String, values: %w[created-by-me assigned-to-me all],
49
                         desc: 'Return merge requests for the given scope: `created-by-me`, `assigned-to-me` or `all`'
50
        optional :my_reaction_emoji, type: String, desc: 'Return issues reacted by the authenticated user by the given emoji'
51
        optional :search, type: String, desc: 'Search merge requests for text present in the title or description'
52 53 54 55 56 57 58 59 60 61
        use :pagination
      end
    end

    resource :merge_requests do
      desc 'List merge requests' do
        success Entities::MergeRequestBasic
      end
      params do
        use :merge_requests_params
62 63
        optional :scope, type: String, values: %w[created-by-me assigned-to-me all], default: 'created-by-me',
                         desc: 'Return merge requests for the given scope: `created-by-me`, `assigned-to-me` or `all`'
64 65
      end
      get do
66
        authenticate! unless params[:scope] == 'all'
67 68 69 70 71 72 73 74 75 76 77 78 79 80 81
        merge_requests = find_merge_requests

        options = { with: Entities::MergeRequestBasic,
                    current_user: current_user }

        if params[:view] == 'simple'
          options[:with] = Entities::MergeRequestSimple
        else
          options[:issuable_metadata] = issuable_meta_data(merge_requests, 'MergeRequest')
        end

        present merge_requests, options
      end
    end

82 83 84
    params do
      requires :id, type: String, desc: 'The ID of a project'
    end
85
    resource :projects, requirements: API::PROJECT_ENDPOINT_REQUIREMENTS do
86 87
      include TimeTrackingEndpoints

88
      helpers do
89 90 91
        def handle_merge_request_errors!(errors)
          if errors[:project_access].any?
            error!(errors[:project_access], 422)
92 93
          elsif errors[:branch_conflict].any?
            error!(errors[:branch_conflict], 422)
94 95 96 97
          elsif errors[:validate_fork].any?
            error!(errors[:validate_fork], 422)
          elsif errors[:validate_branches].any?
            conflict!(errors[:validate_branches])
98 99
          elsif errors[:base].any?
            error!(errors[:base], 422)
100
          end
101 102

          render_api_error!(errors, 400)
103
        end
104

105 106 107 108 109 110
        def check_sha_param!(params, merge_request)
          if params[:sha] && merge_request.diff_head_sha != params[:sha]
            render_api_error!("SHA does not match HEAD of source branch: #{merge_request.diff_head_sha}", 409)
          end
        end

111
        params :optional_params_ce do
112 113 114 115
          optional :description, type: String, desc: 'The description of the merge request'
          optional :assignee_id, type: Integer, desc: 'The ID of a user to assign the merge request'
          optional :milestone_id, type: Integer, desc: 'The ID of a milestone to assign the merge request'
          optional :labels, type: String, desc: 'Comma-separated list of label names'
116
          optional :remove_source_branch, type: Boolean, desc: 'Remove source branch when merging'
117 118 119 120
        end

        params :optional_params_ee do
          optional :approvals_before_merge, type: Integer, desc: 'Number of approvals required before this can be merged'
Sean McGivern's avatar
Sean McGivern committed
121
          optional :squash, type: Boolean, desc: 'Squash commits when merging'
122
        end
123 124 125 126 127

        params :optional_params do
          use :optional_params_ce
          use :optional_params_ee
        end
128 129
      end

130
      desc 'List merge requests' do
131
        success Entities::MergeRequestBasic
132 133
      end
      params do
134
        use :merge_requests_params
135
        optional :iids, type: Array[Integer], desc: 'The IID array of merge requests'
136
      end
137
      get ":id/merge_requests" do
138
        authorize! :read_merge_request, user_project
139

140
        merge_requests = find_merge_requests(project_id: user_project.id)
141

142 143 144 145
        options = { with: Entities::MergeRequestBasic,
                    current_user: current_user,
                    project: user_project }

146
        if params[:view] == 'simple'
147 148 149 150 151 152
          options[:with] = Entities::MergeRequestSimple
        else
          options[:issuable_metadata] = issuable_meta_data(merge_requests, 'MergeRequest')
        end

        present merge_requests, options
153
      end
154

155 156 157 158 159 160 161 162 163 164 165
      desc 'Create a merge request' do
        success Entities::MergeRequest
      end
      params do
        requires :title, type: String, desc: 'The title of the merge request'
        requires :source_branch, type: String, desc: 'The source branch'
        requires :target_branch, type: String, desc: 'The target branch'
        optional :target_project_id, type: Integer,
                                     desc: 'The target project of the merge request defaults to the :id of the project'
        use :optional_params
      end
166
      post ":id/merge_requests" do
167 168
        Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/42316')

169
        authorize! :create_merge_request, user_project
170

171
        mr_params = declared_params(include_missing: false)
172
        mr_params[:force_remove_source_branch] = mr_params.delete(:remove_source_branch)
173

174
        merge_request = ::MergeRequests::CreateService.new(user_project, current_user, mr_params).execute
Izaak Alpert's avatar
Izaak Alpert committed
175

176
        if merge_request.valid?
177
          present merge_request, with: Entities::MergeRequest, current_user: current_user, project: user_project
178 179
        else
          handle_merge_request_errors! merge_request.errors
Valeriy Sizov's avatar
Valeriy Sizov committed
180
        end
181 182
      end

183 184
      desc 'Delete a merge request'
      params do
185
        requires :merge_request_iid, type: Integer, desc: 'The IID of a merge request'
186
      end
187 188
      delete ":id/merge_requests/:merge_request_iid" do
        merge_request = find_project_merge_request(params[:merge_request_iid])
189

190
        authorize!(:destroy_merge_request, merge_request)
191

192 193 194
        destroy_conditionally!(merge_request) do |merge_request|
          Issuable::DestroyService.new(user_project, current_user).execute(merge_request)
        end
195 196
      end

197
      params do
198
        requires :merge_request_iid, type: Integer, desc: 'The IID of a merge request'
199
      end
200 201 202
      desc 'Get a single merge request' do
        success Entities::MergeRequest
      end
203 204
      get ':id/merge_requests/:merge_request_iid' do
        merge_request = find_merge_request_with_access(params[:merge_request_iid])
205

206 207
        present merge_request, with: Entities::MergeRequest, current_user: current_user, project: user_project
      end
208

209 210 211 212 213 214 215 216 217 218
      desc 'Get the participants of a merge request' do
        success Entities::UserBasic
      end
      get ':id/merge_requests/:merge_request_iid/participants' do
        merge_request = find_merge_request_with_access(params[:merge_request_iid])
        participants = ::Kaminari.paginate_array(merge_request.participants)

        present paginate(participants), with: Entities::UserBasic
      end

219
      desc 'Get the commits of a merge request' do
220
        success Entities::Commit
221
      end
222 223
      get ':id/merge_requests/:merge_request_iid/commits' do
        merge_request = find_merge_request_with_access(params[:merge_request_iid])
224
        commits = ::Kaminari.paginate_array(merge_request.commits)
225

226
        present paginate(commits), with: Entities::Commit
227
      end
228

229 230 231
      desc 'Show the merge request changes' do
        success Entities::MergeRequestChanges
      end
232 233
      get ':id/merge_requests/:merge_request_iid/changes' do
        merge_request = find_merge_request_with_access(params[:merge_request_iid])
234

235 236
        present merge_request, with: Entities::MergeRequestChanges, current_user: current_user
      end
237

238 239 240 241 242 243 244 245 246
      desc 'Get the merge request pipelines' do
        success Entities::PipelineBasic
      end
      get ':id/merge_requests/:merge_request_iid/pipelines' do
        pipelines = merge_request_pipelines_with_access

        present paginate(pipelines), with: Entities::PipelineBasic
      end

247 248 249 250
      desc 'Update a merge request' do
        success Entities::MergeRequest
      end
      params do
251 252 253 254 255 256 257 258 259
        # CE
        at_least_one_of_ce = [
          :assignee_id,
          :description,
          :labels,
          :milestone_id,
          :remove_source_branch,
          :state_event,
          :target_branch,
260 261
          :title,
          :discussion_locked
262
        ]
263 264
        optional :title, type: String, allow_blank: false, desc: 'The title of the merge request'
        optional :target_branch, type: String, allow_blank: false, desc: 'The target branch'
265
        optional :state_event, type: String, values: %w[close reopen],
266
                               desc: 'Status of the merge request'
267
        optional :discussion_locked, type: Boolean, desc: 'Whether the MR discussion is locked'
268 269 270 271 272 273

        # EE
        at_least_one_of_ee = [
          :squash
        ]

274
        use :optional_params
275
        at_least_one_of(*(at_least_one_of_ce + at_least_one_of_ee))
276
      end
277
      put ':id/merge_requests/:merge_request_iid' do
278 279
        Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/42318')

280
        merge_request = find_merge_request_with_access(params.delete(:merge_request_iid), :update_merge_request)
281

282 283
        mr_params = declared_params(include_missing: false)
        mr_params[:force_remove_source_branch] = mr_params.delete(:remove_source_branch) if mr_params[:remove_source_branch].present?
284

285
        merge_request = ::MergeRequests::UpdateService.new(user_project, current_user, mr_params).execute(merge_request)
286

287 288 289 290
        if merge_request.valid?
          present merge_request, with: Entities::MergeRequest, current_user: current_user, project: user_project
        else
          handle_merge_request_errors! merge_request.errors
291
        end
292
      end
293

294 295 296 297
      desc 'Merge a merge request' do
        success Entities::MergeRequest
      end
      params do
298
        # CE
299 300 301
        optional :merge_commit_message, type: String, desc: 'Custom merge commit message'
        optional :should_remove_source_branch, type: Boolean,
                                               desc: 'When true, the source branch will be deleted if possible'
302 303
        optional :merge_when_pipeline_succeeds, type: Boolean,
                                                desc: 'When true, this merge request will be merged when the pipeline succeeds'
304
        optional :sha, type: String, desc: 'When present, must have the HEAD SHA of the source branch'
305 306

        # EE
307 308
        optional :squash, type: Boolean, desc: 'When true, the commits will be squashed into a single commit on merge'
      end
309
      put ':id/merge_requests/:merge_request_iid/merge' do
310 311
        Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/42317')

312
        merge_request = find_project_merge_request(params[:merge_request_iid])
313
        merge_when_pipeline_succeeds = to_boolean(params[:merge_when_pipeline_succeeds])
314

315 316 317
        # Merge request can not be merged
        # because user dont have permissions to push into target branch
        unauthorized! unless merge_request.can_be_merged_by?(current_user)
318

319
        not_allowed! unless merge_request.mergeable_state?(skip_ci_check: merge_when_pipeline_succeeds)
320

321
        render_api_error!('Branch cannot be merged', 406) unless merge_request.mergeable?(skip_ci_check: merge_when_pipeline_succeeds)
322

323
        check_sha_param!(params, merge_request)
324

325
        if params[:squash] && merge_request.project.feature_available?(:merge_request_squash)
326 327
          merge_request.update(squash: params[:squash])
        end
Sean McGivern's avatar
Sean McGivern committed
328

329 330 331 332
        merge_params = {
          commit_message: params[:merge_commit_message],
          should_remove_source_branch: params[:should_remove_source_branch]
        }
333

334
        if merge_when_pipeline_succeeds && merge_request.head_pipeline && merge_request.head_pipeline.active?
335 336 337 338 339 340 341
          ::MergeRequests::MergeWhenPipelineSucceedsService
            .new(merge_request.target_project, current_user, merge_params)
            .execute(merge_request)
        else
          ::MergeRequests::MergeService
            .new(merge_request.target_project, current_user, merge_params)
            .execute(merge_request)
342
        end
343

344 345
        present merge_request, with: Entities::MergeRequest, current_user: current_user, project: user_project
      end
346

347 348 349
      desc 'Cancel merge if "Merge When Pipeline Succeeds" is enabled' do
        success Entities::MergeRequest
      end
350 351
      post ':id/merge_requests/:merge_request_iid/cancel_merge_when_pipeline_succeeds' do
        merge_request = find_project_merge_request(params[:merge_request_iid])
352

353
        unauthorized! unless merge_request.can_cancel_merge_when_pipeline_succeeds?(current_user)
354

355
        ::MergeRequests::MergeWhenPipelineSucceedsService
356 357 358
          .new(merge_request.target_project, current_user)
          .cancel(merge_request)
      end
Valeriy Sizov's avatar
Valeriy Sizov committed
359

360 361 362 363
      # Get the status of the merge request's approvals
      #
      # Parameters:
      #   id (required)                 - The ID of a project
364
      #   merge_request_idd (required)  - IID of MR
365
      # Examples:
366
      #   GET /projects/:id/merge_requests/:merge_request_iid/approvals
367
      #
368 369 370
      desc "List a merge request's approvals" do
        success Entities::MergeRequestApprovals
      end
371 372
      get ':id/merge_requests/:merge_request_iid/approvals' do
        merge_request = find_merge_request_with_access(params[:merge_request_iid])
Patricio Cano's avatar
Patricio Cano committed
373

374 375
        present merge_request, with: Entities::MergeRequestApprovals, current_user: current_user
      end
376

377 378 379 380
      # Approve a merge request
      #
      # Parameters:
      #   id (required)                 - The ID of a project
381
      #   merge_request_iid (required)  - IID of MR
382
      # Examples:
383
      #   POST /projects/:id/merge_requests/:merge_request_iid/approve
384
      #
385 386 387 388 389 390
      desc 'Approve a merge request' do
        success Entities::MergeRequestApprovals
      end
      params do
        optional :sha, type: String, desc: 'When present, must have the HEAD SHA of the source branch'
      end
391 392
      post ':id/merge_requests/:merge_request_iid/approve' do
        merge_request = find_project_merge_request(params[:merge_request_iid])
393

394
        unauthorized! unless merge_request.can_approve?(current_user)
395

396 397
        check_sha_param!(params, merge_request)

398 399 400
        ::MergeRequests::ApprovalService
          .new(user_project, current_user)
          .execute(merge_request)
401

402 403 404
        present merge_request, with: Entities::MergeRequestApprovals, current_user: current_user
      end

405 406 407
      desc 'Remove an approval from a merge request' do
        success Entities::MergeRequestApprovals
      end
408
      post ':id/merge_requests/:merge_request_iid/unapprove' do
409
        merge_request = find_project_merge_request(params[:merge_request_iid])
410 411 412 413 414 415 416 417

        not_found! unless merge_request.has_approved?(current_user)

        ::MergeRequests::RemoveApprovalService
          .new(user_project, current_user)
          .execute(merge_request)

        present merge_request, with: Entities::MergeRequestApprovals, current_user: current_user
418
      end
419 420 421 422 423 424 425

      desc 'List issues that will be closed on merge' do
        success Entities::MRNote
      end
      params do
        use :pagination
      end
426 427
      get ':id/merge_requests/:merge_request_iid/closes_issues' do
        merge_request = find_merge_request_with_access(params[:merge_request_iid])
428
        issues = ::Kaminari.paginate_array(merge_request.closes_issues(current_user))
429 430 431 432 433 434 435 436
        issues = paginate(issues)

        external_issues, internal_issues = issues.partition { |issue| issue.is_a?(ExternalIssue) }

        data = Entities::IssueBasic.represent(internal_issues, current_user: current_user)
        data += Entities::ExternalIssue.represent(external_issues, current_user: current_user)

        data.as_json
437
      end
438 439 440
    end
  end
end