2018-09-29 22:34:47 +00:00
|
|
|
# frozen_string_literal: true
|
|
|
|
|
2013-05-14 12:33:31 +00:00
|
|
|
module API
|
2012-10-21 11:00:27 +00:00
|
|
|
class MergeRequests < Grape::API
|
2016-12-04 17:11:19 +00:00
|
|
|
include PaginationParams
|
|
|
|
|
2017-09-18 17:29:17 +00:00
|
|
|
before { authenticate_non_get! }
|
2012-10-21 11:00:27 +00:00
|
|
|
|
2017-07-24 20:07:37 +00:00
|
|
|
helpers ::Gitlab::IssuableMetadata
|
|
|
|
|
2018-03-05 17:30:05 +00:00
|
|
|
# EE::API::MergeRequests would override the following helpers
|
|
|
|
helpers do
|
|
|
|
params :optional_params_ee do
|
|
|
|
end
|
2019-03-07 23:55:45 +00:00
|
|
|
|
|
|
|
params :optional_merge_requests_search_params do
|
|
|
|
end
|
2018-03-05 17:30:05 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
def self.update_params_at_least_one_of
|
|
|
|
%i[
|
|
|
|
assignee_id
|
2019-04-07 18:35:16 +00:00
|
|
|
assignee_ids
|
2018-03-05 17:30:05 +00:00
|
|
|
description
|
|
|
|
labels
|
|
|
|
milestone_id
|
|
|
|
remove_source_branch
|
|
|
|
state_event
|
|
|
|
target_branch
|
|
|
|
title
|
|
|
|
discussion_locked
|
2018-05-29 09:51:43 +00:00
|
|
|
squash
|
2018-03-05 17:30:05 +00:00
|
|
|
]
|
|
|
|
end
|
|
|
|
|
2017-07-24 20:07:37 +00:00
|
|
|
helpers do
|
2018-08-27 15:31:01 +00:00
|
|
|
# rubocop: disable CodeReuse/ActiveRecord
|
2017-07-24 20:07:37 +00:00
|
|
|
def find_merge_requests(args = {})
|
2017-12-19 21:57:46 +00:00
|
|
|
args = declared_params.merge(args)
|
2017-07-24 20:07:37 +00:00
|
|
|
args[:milestone_title] = args.delete(:milestone)
|
|
|
|
args[:label_name] = args.delete(:labels)
|
2018-05-14 02:07:53 +00:00
|
|
|
args[:scope] = args[:scope].underscore if args[:scope]
|
2017-07-24 20:07:37 +00:00
|
|
|
|
|
|
|
merge_requests = MergeRequestsFinder.new(current_user, args).execute
|
2019-02-16 10:03:42 +00:00
|
|
|
.reorder(order_options_with_tie_breaker)
|
2017-07-24 20:07:37 +00:00
|
|
|
merge_requests = paginate(merge_requests)
|
2018-06-03 10:31:41 +00:00
|
|
|
.preload(:source_project, :target_project)
|
2017-07-24 20:07:37 +00:00
|
|
|
|
|
|
|
return merge_requests if args[:view] == 'simple'
|
|
|
|
|
|
|
|
merge_requests
|
2019-03-02 17:31:36 +00:00
|
|
|
.with_api_entity_associations
|
2017-07-24 20:07:37 +00:00
|
|
|
end
|
2018-08-27 15:31:01 +00:00
|
|
|
# rubocop: enable CodeReuse/ActiveRecord
|
2017-07-24 20:07:37 +00:00
|
|
|
|
2018-01-10 17:05:34 +00:00
|
|
|
def merge_request_pipelines_with_access
|
|
|
|
authorize! :read_pipeline, user_project
|
|
|
|
|
2017-11-16 18:10:15 +00:00
|
|
|
mr = find_merge_request_with_access(params[:merge_request_iid])
|
|
|
|
mr.all_pipelines
|
|
|
|
end
|
|
|
|
|
2018-03-05 17:30:05 +00:00
|
|
|
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
|
|
|
|
|
2018-05-31 15:29:07 +00:00
|
|
|
def serializer_options_for(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
|
|
|
|
|
|
|
|
options
|
|
|
|
end
|
|
|
|
|
2018-11-22 06:02:58 +00:00
|
|
|
def authorize_push_to_merge_request!(merge_request)
|
|
|
|
forbidden!('Source branch does not exist') unless
|
|
|
|
merge_request.source_branch_exists?
|
|
|
|
|
|
|
|
user_access = Gitlab::UserAccess.new(
|
|
|
|
current_user,
|
|
|
|
project: merge_request.source_project
|
|
|
|
)
|
|
|
|
|
|
|
|
forbidden!('Cannot push to source branch') unless
|
|
|
|
user_access.can_push_to_branch?(merge_request.source_branch)
|
|
|
|
end
|
|
|
|
|
2017-07-24 20:07:37 +00:00
|
|
|
params :merge_requests_params do
|
2018-06-26 19:30:29 +00:00
|
|
|
optional :state, type: String, values: %w[opened closed locked merged all], default: 'all',
|
|
|
|
desc: 'Return opened, closed, locked, merged, or all merge requests'
|
2017-07-24 20:07:37 +00:00
|
|
|
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'
|
2019-03-01 14:37:22 +00:00
|
|
|
optional :labels, type: Array[String], coerce_with: Validations::Types::LabelsList.coerce, desc: 'Comma-separated list of label names'
|
2017-07-24 20:07:37 +00:00
|
|
|
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'
|
2018-02-28 11:16:29 +00:00
|
|
|
optional :updated_after, type: DateTime, desc: 'Return merge requests updated after the specified time'
|
|
|
|
optional :updated_before, type: DateTime, desc: 'Return merge requests updated before the specified time'
|
2017-07-24 20:07:37 +00:00
|
|
|
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'
|
2018-10-25 14:20:06 +00:00
|
|
|
optional :assignee_id, types: [Integer, String], integer_none_any: true,
|
2018-10-25 09:19:12 +00:00
|
|
|
desc: 'Return merge requests which are assigned to the user with the given ID'
|
2018-05-14 02:07:53 +00:00
|
|
|
optional :scope, type: String, values: %w[created-by-me assigned-to-me created_by_me assigned_to_me all],
|
|
|
|
desc: 'Return merge requests for the given scope: `created_by_me`, `assigned_to_me` or `all`'
|
2017-09-04 01:43:14 +00:00
|
|
|
optional :my_reaction_emoji, type: String, desc: 'Return issues reacted by the authenticated user by the given emoji'
|
2018-02-23 16:04:20 +00:00
|
|
|
optional :source_branch, type: String, desc: 'Return merge requests with the given source branch'
|
2019-04-05 07:29:53 +00:00
|
|
|
optional :source_project_id, type: Integer, desc: 'Return merge requests with the given source project id'
|
2018-02-23 16:04:20 +00:00
|
|
|
optional :target_branch, type: String, desc: 'Return merge requests with the given target branch'
|
2019-02-05 08:32:27 +00:00
|
|
|
optional :search, type: String, desc: 'Search merge requests for text present in the title, description, or any combination of these'
|
|
|
|
optional :in, type: String, desc: '`title`, `description`, or a string joining them with comma'
|
2018-10-03 08:15:00 +00:00
|
|
|
optional :wip, type: String, values: %w[yes no], desc: 'Search merge requests for WIP in the title'
|
2019-03-07 23:55:45 +00:00
|
|
|
|
|
|
|
use :optional_merge_requests_search_params
|
2017-07-24 20:07:37 +00:00
|
|
|
use :pagination
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
resource :merge_requests do
|
|
|
|
desc 'List merge requests' do
|
|
|
|
success Entities::MergeRequestBasic
|
|
|
|
end
|
|
|
|
params do
|
|
|
|
use :merge_requests_params
|
2018-05-14 02:07:53 +00:00
|
|
|
optional :scope, type: String, values: %w[created-by-me assigned-to-me 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`'
|
2017-07-24 20:07:37 +00:00
|
|
|
end
|
|
|
|
get do
|
2017-09-18 17:29:17 +00:00
|
|
|
authenticate! unless params[:scope] == 'all'
|
2017-07-24 20:07:37 +00:00
|
|
|
merge_requests = find_merge_requests
|
|
|
|
|
2018-05-31 15:29:07 +00:00
|
|
|
present merge_requests, serializer_options_for(merge_requests)
|
|
|
|
end
|
|
|
|
end
|
2017-07-24 20:07:37 +00:00
|
|
|
|
2018-05-31 15:29:07 +00:00
|
|
|
params do
|
|
|
|
requires :id, type: String, desc: 'The ID of a group'
|
|
|
|
end
|
2018-11-08 12:18:17 +00:00
|
|
|
resource :groups, requirements: API::NAMESPACE_OR_PROJECT_REQUIREMENTS do
|
2018-05-31 15:29:07 +00:00
|
|
|
desc 'Get a list of group merge requests' do
|
|
|
|
success Entities::MergeRequestBasic
|
|
|
|
end
|
|
|
|
params do
|
|
|
|
use :merge_requests_params
|
|
|
|
end
|
|
|
|
get ":id/merge_requests" do
|
|
|
|
group = find_group!(params[:id])
|
2017-07-24 20:07:37 +00:00
|
|
|
|
2018-05-31 15:29:07 +00:00
|
|
|
merge_requests = find_merge_requests(group_id: group.id, include_subgroups: true)
|
|
|
|
|
|
|
|
present merge_requests, serializer_options_for(merge_requests)
|
2017-07-24 20:07:37 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-11-08 08:28:52 +00:00
|
|
|
params do
|
|
|
|
requires :id, type: String, desc: 'The ID of a project'
|
|
|
|
end
|
2018-11-08 12:18:17 +00:00
|
|
|
resource :projects, requirements: API::NAMESPACE_OR_PROJECT_REQUIREMENTS do
|
2017-01-18 16:48:16 +00:00
|
|
|
include TimeTrackingEndpoints
|
|
|
|
|
2013-02-05 17:36:36 +00:00
|
|
|
helpers do
|
2013-03-05 22:43:05 +00:00
|
|
|
def handle_merge_request_errors!(errors)
|
|
|
|
if errors[:project_access].any?
|
|
|
|
error!(errors[:project_access], 422)
|
2013-03-07 13:51:56 +00:00
|
|
|
elsif errors[:branch_conflict].any?
|
|
|
|
error!(errors[:branch_conflict], 422)
|
2014-08-18 18:09:09 +00:00
|
|
|
elsif errors[:validate_fork].any?
|
|
|
|
error!(errors[:validate_fork], 422)
|
|
|
|
elsif errors[:validate_branches].any?
|
|
|
|
conflict!(errors[:validate_branches])
|
2017-04-26 22:04:07 +00:00
|
|
|
elsif errors[:base].any?
|
|
|
|
error!(errors[:base], 422)
|
2013-02-05 17:36:36 +00:00
|
|
|
end
|
2014-08-18 18:09:09 +00:00
|
|
|
|
|
|
|
render_api_error!(errors, 400)
|
2013-02-05 17:36:36 +00:00
|
|
|
end
|
2016-11-08 08:28:52 +00:00
|
|
|
|
2018-03-05 17:30:05 +00:00
|
|
|
params :optional_params do
|
2016-11-08 08:28:52 +00:00
|
|
|
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'
|
2019-04-07 18:35:16 +00:00
|
|
|
optional :assignee_ids, type: Array[Integer], desc: 'The array of user IDs to assign issue'
|
2016-11-08 08:28:52 +00:00
|
|
|
optional :milestone_id, type: Integer, desc: 'The ID of a milestone to assign the merge request'
|
2019-03-01 14:37:22 +00:00
|
|
|
optional :labels, type: Array[String], coerce_with: Validations::Types::LabelsList.coerce, desc: 'Comma-separated list of label names'
|
2018-06-15 22:05:24 +00:00
|
|
|
optional :remove_source_branch, type: Boolean, desc: 'Remove source branch when merging'
|
2018-05-23 01:54:57 +00:00
|
|
|
optional :allow_collaboration, type: Boolean, desc: 'Allow commits from members who can merge to the target branch'
|
|
|
|
optional :allow_maintainer_to_push, type: Boolean, as: :allow_collaboration, desc: '[deprecated] See allow_collaboration'
|
2018-05-29 09:51:43 +00:00
|
|
|
optional :squash, type: Grape::API::Boolean, desc: 'When true, the commits will be squashed into a single commit on merge'
|
2017-04-05 16:31:15 +00:00
|
|
|
|
2018-03-05 17:30:05 +00:00
|
|
|
use :optional_params_ee
|
2017-04-05 16:31:15 +00:00
|
|
|
end
|
2013-02-05 17:36:36 +00:00
|
|
|
end
|
|
|
|
|
2016-11-08 08:28:52 +00:00
|
|
|
desc 'List merge requests' do
|
2017-03-06 11:48:10 +00:00
|
|
|
success Entities::MergeRequestBasic
|
2016-11-08 08:28:52 +00:00
|
|
|
end
|
|
|
|
params do
|
2017-07-24 20:07:37 +00:00
|
|
|
use :merge_requests_params
|
2017-01-25 21:35:27 +00:00
|
|
|
optional :iids, type: Array[Integer], desc: 'The IID array of merge requests'
|
2016-11-08 08:28:52 +00:00
|
|
|
end
|
2012-10-21 11:00:27 +00:00
|
|
|
get ":id/merge_requests" do
|
2012-10-21 13:13:39 +00:00
|
|
|
authorize! :read_merge_request, user_project
|
2012-11-29 20:10:07 +00:00
|
|
|
|
2017-04-25 14:56:32 +00:00
|
|
|
merge_requests = find_merge_requests(project_id: user_project.id)
|
2014-09-09 15:39:53 +00:00
|
|
|
|
2018-05-31 15:29:07 +00:00
|
|
|
options = serializer_options_for(merge_requests)
|
|
|
|
options[:project] = user_project
|
2017-07-10 21:58:23 +00:00
|
|
|
|
|
|
|
present merge_requests, options
|
2012-10-21 11:00:27 +00:00
|
|
|
end
|
2012-11-29 20:10:07 +00:00
|
|
|
|
2016-11-08 08:28:52 +00:00
|
|
|
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
|
2012-10-21 11:00:27 +00:00
|
|
|
post ":id/merge_requests" do
|
2018-01-15 15:21:04 +00:00
|
|
|
Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/42316')
|
|
|
|
|
2018-04-06 17:58:53 +00:00
|
|
|
authorize! :create_merge_request_from, user_project
|
2016-11-08 08:28:52 +00:00
|
|
|
|
2016-11-28 20:33:12 +00:00
|
|
|
mr_params = declared_params(include_missing: false)
|
2017-06-14 20:38:27 +00:00
|
|
|
mr_params[:force_remove_source_branch] = mr_params.delete(:remove_source_branch)
|
2019-04-07 18:35:16 +00:00
|
|
|
mr_params = convert_parameters_from_legacy_format(mr_params)
|
2014-08-14 08:17:52 +00:00
|
|
|
|
2016-11-08 08:28:52 +00:00
|
|
|
merge_request = ::MergeRequests::CreateService.new(user_project, current_user, mr_params).execute
|
2013-07-17 15:23:36 +00:00
|
|
|
|
2014-04-02 18:51:53 +00:00
|
|
|
if merge_request.valid?
|
2016-11-04 18:19:08 +00:00
|
|
|
present merge_request, with: Entities::MergeRequest, current_user: current_user, project: user_project
|
2014-04-02 18:51:53 +00:00
|
|
|
else
|
|
|
|
handle_merge_request_errors! merge_request.errors
|
2012-10-21 11:41:06 +00:00
|
|
|
end
|
2012-10-21 11:00:27 +00:00
|
|
|
end
|
|
|
|
|
2016-11-08 08:28:52 +00:00
|
|
|
desc 'Delete a merge request'
|
|
|
|
params do
|
2017-02-25 12:25:32 +00:00
|
|
|
requires :merge_request_iid, type: Integer, desc: 'The IID of a merge request'
|
2016-11-08 08:28:52 +00:00
|
|
|
end
|
2017-02-25 12:25:32 +00:00
|
|
|
delete ":id/merge_requests/:merge_request_iid" do
|
|
|
|
merge_request = find_project_merge_request(params[:merge_request_iid])
|
2016-03-18 18:11:25 +00:00
|
|
|
|
2016-03-21 13:12:52 +00:00
|
|
|
authorize!(:destroy_merge_request, merge_request)
|
2017-03-01 13:35:48 +00:00
|
|
|
|
2017-11-25 15:04:45 +00:00
|
|
|
destroy_conditionally!(merge_request) do |merge_request|
|
|
|
|
Issuable::DestroyService.new(user_project, current_user).execute(merge_request)
|
|
|
|
end
|
2016-02-26 08:55:43 +00:00
|
|
|
end
|
|
|
|
|
2016-11-08 08:28:52 +00:00
|
|
|
params do
|
2017-02-25 12:25:32 +00:00
|
|
|
requires :merge_request_iid, type: Integer, desc: 'The IID of a merge request'
|
2018-07-04 09:35:39 +00:00
|
|
|
optional :render_html, type: Boolean, desc: 'Returns the description and title rendered HTML'
|
2018-09-05 13:07:02 +00:00
|
|
|
optional :include_diverged_commits_count, type: Boolean, desc: 'Returns the commits count behind the target branch'
|
2018-11-28 12:57:47 +00:00
|
|
|
optional :include_rebase_in_progress, type: Boolean, desc: 'Returns whether a rebase operation is ongoing '
|
2016-11-08 08:28:52 +00:00
|
|
|
end
|
2017-01-25 21:35:27 +00:00
|
|
|
desc 'Get a single merge request' do
|
|
|
|
success Entities::MergeRequest
|
|
|
|
end
|
2017-02-25 12:25:32 +00:00
|
|
|
get ':id/merge_requests/:merge_request_iid' do
|
|
|
|
merge_request = find_merge_request_with_access(params[:merge_request_iid])
|
2017-01-03 18:03:13 +00:00
|
|
|
|
2018-11-28 12:57:47 +00:00
|
|
|
present merge_request,
|
|
|
|
with: Entities::MergeRequest,
|
|
|
|
current_user: current_user,
|
|
|
|
project: user_project,
|
|
|
|
render_html: params[:render_html],
|
|
|
|
include_diverged_commits_count: params[:include_diverged_commits_count],
|
|
|
|
include_rebase_in_progress: params[:include_rebase_in_progress]
|
2017-01-25 21:35:27 +00:00
|
|
|
end
|
2014-05-12 13:34:41 +00:00
|
|
|
|
2018-01-05 15:21:53 +00:00
|
|
|
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
|
|
|
|
|
2017-01-25 21:35:27 +00:00
|
|
|
desc 'Get the commits of a merge request' do
|
2017-10-05 08:48:05 +00:00
|
|
|
success Entities::Commit
|
2017-01-25 21:35:27 +00:00
|
|
|
end
|
2017-02-25 12:25:32 +00:00
|
|
|
get ':id/merge_requests/:merge_request_iid/commits' do
|
|
|
|
merge_request = find_merge_request_with_access(params[:merge_request_iid])
|
2017-01-17 04:45:07 +00:00
|
|
|
commits = ::Kaminari.paginate_array(merge_request.commits)
|
2017-01-03 18:03:13 +00:00
|
|
|
|
2017-10-05 08:48:05 +00:00
|
|
|
present paginate(commits), with: Entities::Commit
|
2017-01-25 21:35:27 +00:00
|
|
|
end
|
2015-11-18 10:17:41 +00:00
|
|
|
|
2017-01-25 21:35:27 +00:00
|
|
|
desc 'Show the merge request changes' do
|
|
|
|
success Entities::MergeRequestChanges
|
|
|
|
end
|
2017-02-25 12:25:32 +00:00
|
|
|
get ':id/merge_requests/:merge_request_iid/changes' do
|
|
|
|
merge_request = find_merge_request_with_access(params[:merge_request_iid])
|
2017-01-03 18:03:13 +00:00
|
|
|
|
2018-03-02 16:48:55 +00:00
|
|
|
present merge_request, with: Entities::MergeRequestChanges, current_user: current_user, project: user_project
|
2017-01-25 21:35:27 +00:00
|
|
|
end
|
2014-05-12 13:34:41 +00:00
|
|
|
|
2017-11-16 18:10:15 +00:00
|
|
|
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
|
|
|
|
|
2017-01-25 21:35:27 +00:00
|
|
|
desc 'Update a merge request' do
|
|
|
|
success Entities::MergeRequest
|
|
|
|
end
|
|
|
|
params do
|
|
|
|
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'
|
2016-12-13 21:45:09 +00:00
|
|
|
optional :state_event, type: String, values: %w[close reopen],
|
2017-01-25 21:35:27 +00:00
|
|
|
desc: 'Status of the merge request'
|
2017-08-31 10:38:32 +00:00
|
|
|
optional :discussion_locked, type: Boolean, desc: 'Whether the MR discussion is locked'
|
2017-04-05 16:31:15 +00:00
|
|
|
|
2017-01-25 21:35:27 +00:00
|
|
|
use :optional_params
|
2018-03-05 17:30:05 +00:00
|
|
|
at_least_one_of(*::API::MergeRequests.update_params_at_least_one_of)
|
2017-01-25 21:35:27 +00:00
|
|
|
end
|
2017-02-25 12:25:32 +00:00
|
|
|
put ':id/merge_requests/:merge_request_iid' do
|
2018-01-15 15:21:04 +00:00
|
|
|
Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/42318')
|
|
|
|
|
2017-02-25 12:25:32 +00:00
|
|
|
merge_request = find_merge_request_with_access(params.delete(:merge_request_iid), :update_merge_request)
|
2016-01-28 13:26:02 +00:00
|
|
|
|
2017-01-25 21:35:27 +00:00
|
|
|
mr_params = declared_params(include_missing: false)
|
2019-04-15 17:55:45 +00:00
|
|
|
mr_params[:force_remove_source_branch] = mr_params.delete(:remove_source_branch) if mr_params.has_key?(:remove_source_branch)
|
2019-04-07 18:35:16 +00:00
|
|
|
mr_params = convert_parameters_from_legacy_format(mr_params)
|
2015-11-18 10:17:41 +00:00
|
|
|
|
2017-01-25 21:35:27 +00:00
|
|
|
merge_request = ::MergeRequests::UpdateService.new(user_project, current_user, mr_params).execute(merge_request)
|
2014-05-12 13:34:41 +00:00
|
|
|
|
2017-01-25 21:35:27 +00:00
|
|
|
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
|
2016-01-28 13:26:02 +00:00
|
|
|
end
|
2017-01-25 21:35:27 +00:00
|
|
|
end
|
2014-03-19 18:07:51 +00:00
|
|
|
|
2017-01-25 21:35:27 +00:00
|
|
|
desc 'Merge a merge request' do
|
|
|
|
success Entities::MergeRequest
|
|
|
|
end
|
|
|
|
params do
|
|
|
|
optional :merge_commit_message, type: String, desc: 'Custom merge commit message'
|
2019-01-30 01:29:33 +00:00
|
|
|
optional :squash_commit_message, type: String, desc: 'Custom squash commit message'
|
2017-01-25 21:35:27 +00:00
|
|
|
optional :should_remove_source_branch, type: Boolean,
|
|
|
|
desc: 'When true, the source branch will be deleted if possible'
|
2017-02-17 13:56:13 +00:00
|
|
|
optional :merge_when_pipeline_succeeds, type: Boolean,
|
|
|
|
desc: 'When true, this merge request will be merged when the pipeline succeeds'
|
2017-01-25 21:35:27 +00:00
|
|
|
optional :sha, type: String, desc: 'When present, must have the HEAD SHA of the source branch'
|
2018-05-29 09:51:43 +00:00
|
|
|
optional :squash, type: Grape::API::Boolean, desc: 'When true, the commits will be squashed into a single commit on merge'
|
2017-01-25 21:35:27 +00:00
|
|
|
end
|
2017-02-25 12:25:32 +00:00
|
|
|
put ':id/merge_requests/:merge_request_iid/merge' do
|
2018-01-15 15:21:04 +00:00
|
|
|
Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/42317')
|
|
|
|
|
2017-02-25 12:25:32 +00:00
|
|
|
merge_request = find_project_merge_request(params[:merge_request_iid])
|
2017-04-24 06:53:43 +00:00
|
|
|
merge_when_pipeline_succeeds = to_boolean(params[:merge_when_pipeline_succeeds])
|
2016-01-28 13:26:02 +00:00
|
|
|
|
2017-01-25 21:35:27 +00:00
|
|
|
# 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)
|
2016-01-28 13:26:02 +00:00
|
|
|
|
2017-04-24 06:53:43 +00:00
|
|
|
not_allowed! unless merge_request.mergeable_state?(skip_ci_check: merge_when_pipeline_succeeds)
|
2016-01-28 13:26:02 +00:00
|
|
|
|
2017-04-24 06:53:43 +00:00
|
|
|
render_api_error!('Branch cannot be merged', 406) unless merge_request.mergeable?(skip_ci_check: merge_when_pipeline_succeeds)
|
2016-01-28 13:26:02 +00:00
|
|
|
|
2018-03-05 17:30:05 +00:00
|
|
|
check_sha_param!(params, merge_request)
|
|
|
|
|
2018-05-29 09:51:43 +00:00
|
|
|
merge_request.update(squash: params[:squash]) if params[:squash]
|
2016-06-01 09:21:22 +00:00
|
|
|
|
2019-02-25 13:59:17 +00:00
|
|
|
merge_params = HashWithIndifferentAccess.new(
|
2017-01-25 21:35:27 +00:00
|
|
|
commit_message: params[:merge_commit_message],
|
2019-01-30 01:29:33 +00:00
|
|
|
squash_commit_message: params[:squash_commit_message],
|
2017-01-25 21:35:27 +00:00
|
|
|
should_remove_source_branch: params[:should_remove_source_branch]
|
2019-02-25 13:59:17 +00:00
|
|
|
)
|
2014-03-19 18:07:51 +00:00
|
|
|
|
2017-04-24 06:53:43 +00:00
|
|
|
if merge_when_pipeline_succeeds && merge_request.head_pipeline && merge_request.head_pipeline.active?
|
2019-05-22 11:45:27 +00:00
|
|
|
AutoMergeService.new(merge_request.target_project, current_user, merge_params)
|
|
|
|
.execute(merge_request, AutoMergeService::STRATEGY_MERGE_WHEN_PIPELINE_SUCCEEDS)
|
2017-01-25 21:35:27 +00:00
|
|
|
else
|
|
|
|
::MergeRequests::MergeService
|
|
|
|
.new(merge_request.target_project, current_user, merge_params)
|
|
|
|
.execute(merge_request)
|
2016-01-28 13:26:02 +00:00
|
|
|
end
|
2013-02-27 14:07:42 +00:00
|
|
|
|
2017-01-25 21:35:27 +00:00
|
|
|
present merge_request, with: Entities::MergeRequest, current_user: current_user, project: user_project
|
|
|
|
end
|
2015-10-09 16:14:35 +00:00
|
|
|
|
2019-05-30 20:25:25 +00:00
|
|
|
desc 'Returns the up to date merge-ref HEAD commit'
|
2019-05-21 21:14:22 +00:00
|
|
|
get ':id/merge_requests/:merge_request_iid/merge_ref' do
|
2019-02-08 21:25:26 +00:00
|
|
|
merge_request = find_project_merge_request(params[:merge_request_iid])
|
|
|
|
|
2019-05-30 20:25:25 +00:00
|
|
|
result = ::MergeRequests::MergeabilityCheckService.new(merge_request).execute
|
2019-02-08 21:25:26 +00:00
|
|
|
|
2019-05-31 20:18:27 +00:00
|
|
|
if result.success?
|
|
|
|
present :commit_id, result.payload.dig(:merge_ref_head, :commit_id)
|
2019-02-08 21:25:26 +00:00
|
|
|
else
|
2019-05-21 21:14:22 +00:00
|
|
|
render_api_error!(result.message, 400)
|
2019-02-08 21:25:26 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2017-01-25 21:35:27 +00:00
|
|
|
desc 'Cancel merge if "Merge When Pipeline Succeeds" is enabled' do
|
|
|
|
success Entities::MergeRequest
|
|
|
|
end
|
2017-02-25 12:25:32 +00:00
|
|
|
post ':id/merge_requests/:merge_request_iid/cancel_merge_when_pipeline_succeeds' do
|
|
|
|
merge_request = find_project_merge_request(params[:merge_request_iid])
|
2015-10-09 16:14:35 +00:00
|
|
|
|
2019-05-22 11:45:27 +00:00
|
|
|
unauthorized! unless merge_request.can_cancel_auto_merge?(current_user)
|
2015-10-09 16:14:35 +00:00
|
|
|
|
2019-05-22 11:45:27 +00:00
|
|
|
AutoMergeService.new(merge_request.target_project, current_user).cancel(merge_request)
|
2017-01-25 21:35:27 +00:00
|
|
|
end
|
2012-10-25 10:38:55 +00:00
|
|
|
|
2018-11-22 06:02:58 +00:00
|
|
|
desc 'Rebase the merge request against its target branch' do
|
|
|
|
detail 'This feature was added in GitLab 11.6'
|
|
|
|
end
|
|
|
|
put ':id/merge_requests/:merge_request_iid/rebase' do
|
|
|
|
merge_request = find_project_merge_request(params[:merge_request_iid])
|
|
|
|
|
|
|
|
authorize_push_to_merge_request!(merge_request)
|
|
|
|
|
|
|
|
RebaseWorker.perform_async(merge_request.id, current_user.id)
|
|
|
|
|
|
|
|
status :accepted
|
|
|
|
end
|
|
|
|
|
2017-01-25 21:35:27 +00:00
|
|
|
desc 'List issues that will be closed on merge' do
|
|
|
|
success Entities::MRNote
|
|
|
|
end
|
|
|
|
params do
|
|
|
|
use :pagination
|
|
|
|
end
|
2017-02-25 12:25:32 +00:00
|
|
|
get ':id/merge_requests/:merge_request_iid/closes_issues' do
|
|
|
|
merge_request = find_merge_request_with_access(params[:merge_request_iid])
|
2018-07-30 18:52:42 +00:00
|
|
|
issues = ::Kaminari.paginate_array(merge_request.visible_closing_issues_for(current_user))
|
2017-07-10 07:38:42 +00:00
|
|
|
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
|
2017-01-25 21:35:27 +00:00
|
|
|
end
|
2012-10-21 11:00:27 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|