GitLab steht aufgrund eines wichtigen Updates heute, zwischen 18:00 und 19:00 Uhr, nicht zur Verfügung.

merge_requests.rb 11.8 KB
Newer Older
1
module API
Valeriy Sizov's avatar
Valeriy Sizov committed
2
  class MergeRequests < Grape::API
3 4
    include PaginationParams

5 6
    DEPRECATION_MESSAGE = 'This endpoint is deprecated and will be removed in GitLab 9.0.'.freeze

Valeriy Sizov's avatar
Valeriy Sizov committed
7 8
    before { authenticate! }

9 10 11
    params do
      requires :id, type: String, desc: 'The ID of a project'
    end
Hiroyuki Sato's avatar
Hiroyuki Sato committed
12
    resource :projects do
13 14
      include TimeTrackingEndpoints

15
      helpers do
16 17 18
        def handle_merge_request_errors!(errors)
          if errors[:project_access].any?
            error!(errors[:project_access], 422)
19 20
          elsif errors[:branch_conflict].any?
            error!(errors[:branch_conflict], 422)
21 22 23 24
          elsif errors[:validate_fork].any?
            error!(errors[:validate_fork], 422)
          elsif errors[:validate_branches].any?
            conflict!(errors[:validate_branches])
25
          end
26 27

          render_api_error!(errors, 400)
28
        end
29 30 31 32 33 34

        params :optional_params do
          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'
35
          optional :remove_source_branch, type: Boolean, desc: 'Remove source branch when merging'
36
        end
37 38
      end

39 40 41 42 43 44 45 46 47 48
      desc 'List merge requests' do
        success Entities::MergeRequest
      end
      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.'
49
        optional :iid, type: Array[Integer], desc: 'The IID of the merge requests'
50
        use :pagination
51
      end
Valeriy Sizov's avatar
Valeriy Sizov committed
52
      get ":id/merge_requests" do
53
        authorize! :read_merge_request, user_project
54

55 56
        merge_requests = user_project.merge_requests.inc_notes_with_associations
        merge_requests = filter_by_iid(merge_requests, params[:iid]) if params[:iid].present?
57

58
        merge_requests =
59 60 61 62
          case params[:state]
          when 'opened' then merge_requests.opened
          when 'closed' then merge_requests.closed
          when 'merged' then merge_requests.merged
63 64
          else merge_requests
          end
65

66
        merge_requests = merge_requests.reorder(params[:order_by] => params[:sort])
67
        present paginate(merge_requests), with: Entities::MergeRequest, current_user: current_user, project: user_project
Valeriy Sizov's avatar
Valeriy Sizov committed
68
      end
69

70 71 72 73 74 75 76 77 78 79 80
      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
Valeriy Sizov's avatar
Valeriy Sizov committed
81
      post ":id/merge_requests" do
82
        authorize! :create_merge_request, user_project
83

84 85
        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?
86

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

89
        if merge_request.valid?
90
          present merge_request, with: Entities::MergeRequest, current_user: current_user, project: user_project
91 92
        else
          handle_merge_request_errors! merge_request.errors
Valeriy Sizov's avatar
Valeriy Sizov committed
93
        end
Valeriy Sizov's avatar
Valeriy Sizov committed
94 95
      end

96 97 98 99
      desc 'Delete a merge request'
      params do
        requires :merge_request_id, type: Integer, desc: 'The ID of a merge request'
      end
Zeger-Jan van de Weg's avatar
Zeger-Jan van de Weg committed
100
      delete ":id/merge_requests/:merge_request_id" do
101
        merge_request = find_project_merge_request(params[:merge_request_id])
102

103
        authorize!(:destroy_merge_request, merge_request)
Zeger-Jan van de Weg's avatar
Zeger-Jan van de Weg committed
104 105 106
        merge_request.destroy
      end

107 108
      # Routing "merge_request/:merge_request_id/..." is DEPRECATED and WILL BE REMOVED in version 9.0
      # Use "merge_requests/:merge_request_id/..." instead.
Valeriy Sizov's avatar
Valeriy Sizov committed
109
      #
110 111 112 113 114 115 116 117 118 119
      params do
        requires :merge_request_id, type: Integer, desc: 'The ID of a merge request'
      end
      { ":id/merge_request/:merge_request_id" => :deprecated, ":id/merge_requests/:merge_request_id" => :ok }.each do |path, status|
        desc 'Get a single merge request' do
          if status == :deprecated
            detail DEPRECATION_MESSAGE
          end
          success Entities::MergeRequest
        end
120
        get path do
121
          merge_request = find_project_merge_request(params[:merge_request_id])
122
          authorize! :read_merge_request, merge_request
123
          present merge_request, with: Entities::MergeRequest, current_user: current_user, project: user_project
Valeriy Sizov's avatar
Valeriy Sizov committed
124
        end
125

126 127 128
        desc 'Get the commits of a merge request' do
          success Entities::RepoCommit
        end
129
        get "#{path}/commits" do
130
          merge_request = find_project_merge_request(params[:merge_request_id])
131 132
          authorize! :read_merge_request, merge_request
          present merge_request.commits, with: Entities::RepoCommit
133
        end
134

135 136 137
        desc 'Show the merge request changes' do
          success Entities::MergeRequestChanges
        end
138
        get "#{path}/changes" do
139
          merge_request = find_project_merge_request(params[:merge_request_id])
140
          authorize! :read_merge_request, merge_request
141
          present merge_request, with: Entities::MergeRequestChanges, current_user: current_user
142
        end
143

144 145 146 147
        desc 'Update a merge request' do
          success Entities::MergeRequest
        end
        params do
148 149
          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'
150 151 152 153
          optional :state_event, type: String, values: %w[close reopen merge],
                                 desc: 'Status of the merge request'
          use :optional_params
          at_least_one_of :title, :target_branch, :description, :assignee_id,
154 155
                          :milestone_id, :labels, :state_event,
                          :remove_source_branch
156
        end
157
        put path do
158
          merge_request = find_project_merge_request(params.delete(:merge_request_id))
159 160
          authorize! :update_merge_request, merge_request

161
          mr_params = declared_params(include_missing: false)
162
          mr_params[:force_remove_source_branch] = mr_params.delete(:remove_source_branch) if mr_params[:remove_source_branch].present?
163

164
          merge_request = ::MergeRequests::UpdateService.new(user_project, current_user, mr_params).execute(merge_request)
165

166
          if merge_request.valid?
167
            present merge_request, with: Entities::MergeRequest, current_user: current_user, project: user_project
168 169 170 171
          else
            handle_merge_request_errors! merge_request.errors
          end
        end
172

173 174 175 176 177 178 179 180
        desc 'Merge a merge request' do
          success Entities::MergeRequest
        end
        params do
          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'
          optional :merge_when_build_succeeds, type: Boolean,
181
                                               desc: 'When true, this merge request will be merged when the pipeline succeeds'
182 183
          optional :sha, type: String, desc: 'When present, must have the HEAD SHA of the source branch'
        end
184
        put "#{path}/merge" do
185
          merge_request = find_project_merge_request(params[:merge_request_id])
186 187 188 189 190

          # 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)

191
          not_allowed! unless merge_request.mergeable_state?
192

193
          render_api_error!('Branch cannot be merged', 406) unless merge_request.mergeable?
194

195 196
          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)
197 198
          end

199 200 201 202 203
          merge_params = {
            commit_message: params[:merge_commit_message],
            should_remove_source_branch: params[:should_remove_source_branch]
          }

204
          if params[:merge_when_build_succeeds] && merge_request.head_pipeline && merge_request.head_pipeline.active?
205 206 207
            ::MergeRequests::MergeWhenPipelineSucceedsService
              .new(merge_request.target_project, current_user, merge_params)
              .execute(merge_request)
208
          else
209 210 211
            ::MergeRequests::MergeService
              .new(merge_request.target_project, current_user, merge_params)
              .execute(merge_request)
212
          end
213

214
          present merge_request, with: Entities::MergeRequest, current_user: current_user, project: user_project
215
        end
216

217
        desc 'Cancel merge if "Merge When Pipeline Succeeds" is enabled' do
218 219
          success Entities::MergeRequest
        end
220
        post "#{path}/cancel_merge_when_build_succeeds" do
221
          merge_request = find_project_merge_request(params[:merge_request_id])
222

223
          unauthorized! unless merge_request.can_cancel_merge_when_build_succeeds?(current_user)
224

225 226 227
          ::MergeRequest::MergeWhenPipelineSucceedsService
            .new(merge_request.target_project, current_user)
            .cancel(merge_request)
228
        end
229

230 231 232 233
        desc 'Get the comments of a merge request' do
          detail 'Duplicate. DEPRECATED and WILL BE REMOVED in 9.0'
          success Entities::MRNote
        end
234 235 236
        params do
          use :pagination
        end
237
        get "#{path}/comments" do
238
          merge_request = find_project_merge_request(params[:merge_request_id])
239 240 241 242 243

          authorize! :read_merge_request, merge_request

          present paginate(merge_request.notes.fresh), with: Entities::MRNote
        end
Valeriy Sizov's avatar
Valeriy Sizov committed
244

245 246 247 248 249 250 251
        desc 'Post a comment to a merge request' do
          detail 'Duplicate. DEPRECATED and WILL BE REMOVED in 9.0'
          success Entities::MRNote
        end
        params do
          requires :note, type: String, desc: 'The text of the comment'
        end
252
        post "#{path}/comments" do
253
          merge_request = find_project_merge_request(params[:merge_request_id])
254 255 256 257 258 259 260 261 262 263 264 265 266 267 268
          authorize! :create_note, merge_request

          opts = {
            note: params[:note],
            noteable_type: 'MergeRequest',
            noteable_id: merge_request.id
          }

          note = ::Notes::CreateService.new(user_project, current_user, opts).execute

          if note.save
            present note, with: Entities::MRNote
          else
            render_api_error!("Failed to save note #{note.errors.messages}", 400)
          end
269
        end
270

271 272 273
        desc 'List issues that will be closed on merge' do
          success Entities::MRNote
        end
274 275 276
        params do
          use :pagination
        end
277
        get "#{path}/closes_issues" do
278
          merge_request = find_project_merge_request(params[:merge_request_id])
279
          issues = ::Kaminari.paginate_array(merge_request.closes_issues(current_user))
280
          present paginate(issues), with: issue_entity(user_project), current_user: current_user
281
        end
282
      end
Valeriy Sizov's avatar
Valeriy Sizov committed
283 284 285
    end
  end
end