2013-05-14 12:33:31 +00:00
|
|
|
module API
|
2012-10-22 18:59:46 +00:00
|
|
|
# MergeRequest API
|
2012-10-21 11:00:27 +00:00
|
|
|
class MergeRequests < Grape::API
|
|
|
|
before { authenticate! }
|
|
|
|
|
2013-09-21 21:46:36 +00:00
|
|
|
resource :projects do
|
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])
|
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
|
|
|
|
end
|
|
|
|
|
2012-10-22 19:53:06 +00:00
|
|
|
# List merge requests
|
2012-11-29 20:10:07 +00:00
|
|
|
#
|
2012-10-22 19:53:06 +00:00
|
|
|
# Parameters:
|
2012-12-21 17:47:04 +00:00
|
|
|
# id (required) - The ID of a project
|
2015-01-17 22:45:39 +00:00
|
|
|
# iid (optional) - Return the project MR having the given `iid`
|
2014-04-04 16:32:53 +00:00
|
|
|
# state (optional) - Return requests "merged", "opened" or "closed"
|
2015-02-06 06:00:54 +00:00
|
|
|
# order_by (optional) - Return requests ordered by `created_at` or `updated_at` fields. Default is `created_at`
|
|
|
|
# sort (optional) - Return requests sorted in `asc` or `desc` order. Default is `desc`
|
2012-10-22 19:53:06 +00:00
|
|
|
#
|
|
|
|
# Example:
|
2012-10-25 10:13:01 +00:00
|
|
|
# GET /projects/:id/merge_requests
|
2014-04-04 16:32:53 +00:00
|
|
|
# GET /projects/:id/merge_requests?state=opened
|
|
|
|
# GET /projects/:id/merge_requests?state=closed
|
2014-09-09 15:39:53 +00:00
|
|
|
# GET /projects/:id/merge_requests?order_by=created_at
|
2014-09-16 06:44:50 +00:00
|
|
|
# GET /projects/:id/merge_requests?order_by=updated_at
|
2014-09-09 15:39:53 +00:00
|
|
|
# GET /projects/:id/merge_requests?sort=desc
|
|
|
|
# GET /projects/:id/merge_requests?sort=asc
|
2015-01-17 22:45:39 +00:00
|
|
|
# GET /projects/:id/merge_requests?iid=42
|
2012-10-22 19:53:06 +00:00
|
|
|
#
|
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
|
2016-06-06 20:19:39 +00:00
|
|
|
merge_requests = user_project.merge_requests.inc_notes_with_associations
|
2012-11-29 20:10:07 +00:00
|
|
|
|
2015-01-17 22:45:39 +00:00
|
|
|
unless params[:iid].nil?
|
|
|
|
merge_requests = filter_by_iid(merge_requests, params[:iid])
|
|
|
|
end
|
|
|
|
|
2015-02-06 06:00:54 +00:00
|
|
|
merge_requests =
|
|
|
|
case params["state"]
|
|
|
|
when "opened" then merge_requests.opened
|
|
|
|
when "closed" then merge_requests.closed
|
|
|
|
when "merged" then merge_requests.merged
|
|
|
|
else merge_requests
|
|
|
|
end
|
2014-09-09 15:39:53 +00:00
|
|
|
|
2015-09-16 05:38:48 +00:00
|
|
|
merge_requests = merge_requests.reorder(issuable_order_by => issuable_sort)
|
2016-04-08 06:41:10 +00:00
|
|
|
present paginate(merge_requests), with: Entities::MergeRequest, current_user: current_user
|
2012-10-21 11:00:27 +00:00
|
|
|
end
|
2012-11-29 20:10:07 +00:00
|
|
|
|
2012-10-22 19:53:06 +00:00
|
|
|
# Create MR
|
|
|
|
#
|
|
|
|
# Parameters:
|
|
|
|
#
|
2013-04-25 14:15:33 +00:00
|
|
|
# id (required) - The ID of a project - this will be the source of the merge request
|
2012-10-22 19:53:06 +00:00
|
|
|
# source_branch (required) - The source branch
|
|
|
|
# target_branch (required) - The target branch
|
2015-10-13 15:30:48 +00:00
|
|
|
# target_project_id - The target project of the merge request defaults to the :id of the project
|
2012-10-22 19:53:06 +00:00
|
|
|
# assignee_id - Assignee user ID
|
|
|
|
# title (required) - Title of MR
|
2014-03-04 07:08:39 +00:00
|
|
|
# description - Description of MR
|
2014-04-15 01:12:07 +00:00
|
|
|
# labels (optional) - Labels for MR as a comma-separated list
|
2015-12-15 16:40:03 +00:00
|
|
|
# milestone_id (optional) - Milestone ID
|
2012-11-29 20:10:07 +00:00
|
|
|
#
|
2012-10-22 19:53:06 +00:00
|
|
|
# Example:
|
2012-10-25 10:13:01 +00:00
|
|
|
# POST /projects/:id/merge_requests
|
2012-10-22 19:53:06 +00:00
|
|
|
#
|
2012-10-21 11:00:27 +00:00
|
|
|
post ":id/merge_requests" do
|
2015-06-26 13:55:56 +00:00
|
|
|
authorize! :create_merge_request, user_project
|
2014-04-02 18:51:53 +00:00
|
|
|
required_attributes! [:source_branch, :target_branch, :title]
|
2015-12-15 16:40:03 +00:00
|
|
|
attrs = attributes_for_keys [:source_branch, :target_branch, :assignee_id, :title, :target_project_id, :description, :milestone_id]
|
2014-08-14 08:17:52 +00:00
|
|
|
|
|
|
|
# Validate label names in advance
|
2014-08-20 18:34:55 +00:00
|
|
|
if (errors = validate_label_params(params)).any?
|
|
|
|
render_api_error!({ labels: errors }, 400)
|
2014-08-14 08:17:52 +00:00
|
|
|
end
|
|
|
|
|
2014-04-02 18:51:53 +00:00
|
|
|
merge_request = ::MergeRequests::CreateService.new(user_project, current_user, attrs).execute
|
2013-07-17 15:23:36 +00:00
|
|
|
|
2014-04-02 18:51:53 +00:00
|
|
|
if merge_request.valid?
|
2014-07-30 14:17:29 +00:00
|
|
|
# Find or create labels and attach to issue
|
|
|
|
if params[:labels].present?
|
2016-10-03 21:41:46 +00:00
|
|
|
merge_request.add_labels_by_names(params[:labels].split(","), current_user)
|
2014-07-30 14:17:29 +00:00
|
|
|
end
|
|
|
|
|
2016-04-08 06:41:10 +00:00
|
|
|
present merge_request, with: Entities::MergeRequest, current_user: current_user
|
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-02-26 08:55:43 +00:00
|
|
|
# Delete a MR
|
|
|
|
#
|
|
|
|
# Parameters:
|
|
|
|
# id (required) - The ID of the project
|
|
|
|
# merge_request_id (required) - The MR id
|
|
|
|
delete ":id/merge_requests/:merge_request_id" do
|
2016-03-21 13:12:52 +00:00
|
|
|
merge_request = user_project.merge_requests.find_by(id: params[:merge_request_id])
|
2016-03-18 18:11:25 +00:00
|
|
|
|
2016-03-21 13:12:52 +00:00
|
|
|
authorize!(:destroy_merge_request, merge_request)
|
2016-02-26 08:55:43 +00:00
|
|
|
merge_request.destroy
|
|
|
|
end
|
|
|
|
|
2016-01-28 13:26:02 +00:00
|
|
|
# Routing "merge_request/:merge_request_id/..." is DEPRECATED and WILL BE REMOVED in version 9.0
|
|
|
|
# Use "merge_requests/:merge_request_id/..." instead.
|
2012-10-22 19:53:06 +00:00
|
|
|
#
|
2016-01-28 13:26:02 +00:00
|
|
|
[":id/merge_request/:merge_request_id", ":id/merge_requests/:merge_request_id"].each do |path|
|
|
|
|
# Show MR
|
|
|
|
#
|
|
|
|
# Parameters:
|
|
|
|
# id (required) - The ID of a project
|
|
|
|
# merge_request_id (required) - The ID of MR
|
|
|
|
#
|
|
|
|
# Example:
|
|
|
|
# GET /projects/:id/merge_requests/:merge_request_id
|
|
|
|
#
|
|
|
|
get path do
|
|
|
|
merge_request = user_project.merge_requests.find(params[:merge_request_id])
|
|
|
|
|
|
|
|
authorize! :read_merge_request, merge_request
|
2014-07-30 14:17:29 +00:00
|
|
|
|
2016-04-08 06:41:10 +00:00
|
|
|
present merge_request, with: Entities::MergeRequest, current_user: current_user
|
2012-10-21 11:59:50 +00:00
|
|
|
end
|
2014-05-12 13:34:41 +00:00
|
|
|
|
2016-01-28 13:26:02 +00:00
|
|
|
# Show MR commits
|
|
|
|
#
|
|
|
|
# Parameters:
|
|
|
|
# id (required) - The ID of a project
|
|
|
|
# merge_request_id (required) - The ID of MR
|
|
|
|
#
|
|
|
|
# Example:
|
|
|
|
# GET /projects/:id/merge_requests/:merge_request_id/commits
|
|
|
|
#
|
|
|
|
get "#{path}/commits" do
|
|
|
|
merge_request = user_project.merge_requests.
|
|
|
|
find(params[:merge_request_id])
|
|
|
|
authorize! :read_merge_request, merge_request
|
|
|
|
present merge_request.commits, with: Entities::RepoCommit
|
2014-05-12 13:34:41 +00:00
|
|
|
end
|
2015-11-18 10:17:41 +00:00
|
|
|
|
2016-01-28 13:26:02 +00:00
|
|
|
# Show MR changes
|
|
|
|
#
|
|
|
|
# Parameters:
|
|
|
|
# id (required) - The ID of a project
|
|
|
|
# merge_request_id (required) - The ID of MR
|
|
|
|
#
|
|
|
|
# Example:
|
|
|
|
# GET /projects/:id/merge_requests/:merge_request_id/changes
|
|
|
|
#
|
|
|
|
get "#{path}/changes" do
|
|
|
|
merge_request = user_project.merge_requests.
|
|
|
|
find(params[:merge_request_id])
|
|
|
|
authorize! :read_merge_request, merge_request
|
2016-04-08 06:41:10 +00:00
|
|
|
present merge_request, with: Entities::MergeRequestChanges, current_user: current_user
|
2016-01-28 13:26:02 +00:00
|
|
|
end
|
2014-05-12 13:34:41 +00:00
|
|
|
|
2016-01-28 13:26:02 +00:00
|
|
|
# Update MR
|
|
|
|
#
|
|
|
|
# Parameters:
|
|
|
|
# id (required) - The ID of a project
|
|
|
|
# merge_request_id (required) - ID of MR
|
|
|
|
# target_branch - The target branch
|
|
|
|
# assignee_id - Assignee user ID
|
|
|
|
# title - Title of MR
|
|
|
|
# state_event - Status of MR. (close|reopen|merge)
|
|
|
|
# description - Description of MR
|
|
|
|
# labels (optional) - Labels for a MR as a comma-separated list
|
2015-12-15 16:40:03 +00:00
|
|
|
# milestone_id (optional) - Milestone ID
|
2016-01-28 13:26:02 +00:00
|
|
|
# Example:
|
|
|
|
# PUT /projects/:id/merge_requests/:merge_request_id
|
|
|
|
#
|
|
|
|
put path do
|
2015-12-15 16:40:03 +00:00
|
|
|
attrs = attributes_for_keys [:target_branch, :assignee_id, :title, :state_event, :description, :milestone_id]
|
2016-01-28 13:26:02 +00:00
|
|
|
merge_request = user_project.merge_requests.find(params[:merge_request_id])
|
|
|
|
authorize! :update_merge_request, merge_request
|
|
|
|
|
|
|
|
# Ensure source_branch is not specified
|
|
|
|
if params[:source_branch].present?
|
|
|
|
render_api_error!('Source branch cannot be changed', 400)
|
|
|
|
end
|
2015-11-18 10:17:41 +00:00
|
|
|
|
2016-01-28 13:26:02 +00:00
|
|
|
# Validate label names in advance
|
|
|
|
if (errors = validate_label_params(params)).any?
|
|
|
|
render_api_error!({ labels: errors }, 400)
|
|
|
|
end
|
2015-11-18 10:17:41 +00:00
|
|
|
|
2016-01-28 13:26:02 +00:00
|
|
|
merge_request = ::MergeRequests::UpdateService.new(user_project, current_user, attrs).execute(merge_request)
|
2014-05-12 13:34:41 +00:00
|
|
|
|
2016-01-28 13:26:02 +00:00
|
|
|
if merge_request.valid?
|
|
|
|
# Find or create labels and attach to issue
|
|
|
|
unless params[:labels].nil?
|
|
|
|
merge_request.remove_labels
|
2016-10-03 21:41:46 +00:00
|
|
|
merge_request.add_labels_by_names(params[:labels].split(","), current_user)
|
2016-01-28 13:26:02 +00:00
|
|
|
end
|
2014-03-19 18:07:51 +00:00
|
|
|
|
2016-04-08 06:41:10 +00:00
|
|
|
present merge_request, with: Entities::MergeRequest, current_user: current_user
|
2016-01-28 13:26:02 +00:00
|
|
|
else
|
|
|
|
handle_merge_request_errors! merge_request.errors
|
|
|
|
end
|
|
|
|
end
|
2014-03-19 18:07:51 +00:00
|
|
|
|
2016-01-28 13:26:02 +00:00
|
|
|
# Merge MR
|
|
|
|
#
|
|
|
|
# Parameters:
|
|
|
|
# id (required) - The ID of a project
|
|
|
|
# merge_request_id (required) - ID of MR
|
|
|
|
# merge_commit_message (optional) - Custom merge commit message
|
|
|
|
# should_remove_source_branch (optional) - When true, the source branch will be deleted if possible
|
|
|
|
# merge_when_build_succeeds (optional) - When true, this MR will be merged when the build succeeds
|
2016-06-01 09:21:22 +00:00
|
|
|
# sha (optional) - When present, must have the HEAD SHA of the source branch
|
2016-01-28 13:26:02 +00:00
|
|
|
# Example:
|
|
|
|
# PUT /projects/:id/merge_requests/:merge_request_id/merge
|
|
|
|
#
|
|
|
|
put "#{path}/merge" do
|
|
|
|
merge_request = user_project.merge_requests.find(params[:merge_request_id])
|
|
|
|
|
|
|
|
# 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-06-07 11:01:34 +00:00
|
|
|
not_allowed! unless merge_request.mergeable_state?
|
2016-01-28 13:26:02 +00:00
|
|
|
|
2016-06-07 11:01:34 +00:00
|
|
|
render_api_error!('Branch cannot be merged', 406) unless merge_request.mergeable?
|
2016-01-28 13:26:02 +00:00
|
|
|
|
2016-06-20 16:48:04 +00:00
|
|
|
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)
|
2016-06-01 09:21:22 +00:00
|
|
|
end
|
|
|
|
|
2016-01-28 13:26:02 +00:00
|
|
|
merge_params = {
|
|
|
|
commit_message: params[:merge_commit_message],
|
|
|
|
should_remove_source_branch: params[:should_remove_source_branch]
|
|
|
|
}
|
|
|
|
|
2016-07-20 06:55:44 +00:00
|
|
|
if to_boolean(params[:merge_when_build_succeeds]) && merge_request.pipeline && merge_request.pipeline.active?
|
2016-01-28 13:26:02 +00:00
|
|
|
::MergeRequests::MergeWhenBuildSucceedsService.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)
|
|
|
|
end
|
2014-03-19 18:07:51 +00:00
|
|
|
|
2016-04-08 06:41:10 +00:00
|
|
|
present merge_request, with: Entities::MergeRequest, current_user: current_user
|
2016-01-28 13:26:02 +00:00
|
|
|
end
|
2013-02-27 14:07:42 +00:00
|
|
|
|
2016-01-28 13:26:02 +00:00
|
|
|
# Cancel Merge if Merge When build succeeds is enabled
|
|
|
|
# Parameters:
|
|
|
|
# id (required) - The ID of a project
|
|
|
|
# merge_request_id (required) - ID of MR
|
|
|
|
#
|
|
|
|
post "#{path}/cancel_merge_when_build_succeeds" do
|
|
|
|
merge_request = user_project.merge_requests.find(params[:merge_request_id])
|
2015-10-09 16:14:35 +00:00
|
|
|
|
2016-01-28 13:26:02 +00:00
|
|
|
unauthorized! unless merge_request.can_cancel_merge_when_build_succeeds?(current_user)
|
2015-10-09 16:14:35 +00:00
|
|
|
|
2016-01-28 13:26:02 +00:00
|
|
|
::MergeRequest::MergeWhenBuildSucceedsService.new(merge_request.target_project, current_user).cancel(merge_request)
|
|
|
|
end
|
2015-10-09 16:14:35 +00:00
|
|
|
|
2016-01-28 13:26:02 +00:00
|
|
|
# Duplicate. DEPRECATED and WILL BE REMOVED in 9.0.
|
|
|
|
# Use GET "/projects/:id/merge_requests/:merge_request_id/notes" instead
|
|
|
|
#
|
|
|
|
# Get a merge request's comments
|
|
|
|
#
|
|
|
|
# Parameters:
|
|
|
|
# id (required) - The ID of a project
|
|
|
|
# merge_request_id (required) - ID of MR
|
|
|
|
# Examples:
|
|
|
|
# GET /projects/:id/merge_requests/:merge_request_id/comments
|
|
|
|
#
|
|
|
|
get "#{path}/comments" do
|
|
|
|
merge_request = user_project.merge_requests.find(params[:merge_request_id])
|
|
|
|
|
|
|
|
authorize! :read_merge_request, merge_request
|
|
|
|
|
|
|
|
present paginate(merge_request.notes.fresh), with: Entities::MRNote
|
|
|
|
end
|
2012-10-25 10:38:55 +00:00
|
|
|
|
2016-01-28 13:26:02 +00:00
|
|
|
# Duplicate. DEPRECATED and WILL BE REMOVED in 9.0.
|
|
|
|
# Use POST "/projects/:id/merge_requests/:merge_request_id/notes" instead
|
|
|
|
#
|
|
|
|
# Post comment to merge request
|
|
|
|
#
|
|
|
|
# Parameters:
|
|
|
|
# id (required) - The ID of a project
|
|
|
|
# merge_request_id (required) - ID of MR
|
|
|
|
# note (required) - Text of comment
|
|
|
|
# Examples:
|
|
|
|
# POST /projects/:id/merge_requests/:merge_request_id/comments
|
|
|
|
#
|
|
|
|
post "#{path}/comments" do
|
|
|
|
required_attributes! [:note]
|
|
|
|
|
|
|
|
merge_request = user_project.merge_requests.find(params[:merge_request_id])
|
|
|
|
|
|
|
|
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
|
2012-10-21 16:48:56 +00:00
|
|
|
end
|
2016-01-31 09:05:47 +00:00
|
|
|
|
|
|
|
# List issues that will close on merge
|
|
|
|
#
|
|
|
|
# Parameters:
|
|
|
|
# id (required) - The ID of a project
|
|
|
|
# merge_request_id (required) - ID of MR
|
|
|
|
# Examples:
|
|
|
|
# GET /projects/:id/merge_requests/:merge_request_id/closes_issues
|
|
|
|
get "#{path}/closes_issues" do
|
|
|
|
merge_request = user_project.merge_requests.find(params[:merge_request_id])
|
2016-02-10 16:11:23 +00:00
|
|
|
issues = ::Kaminari.paginate_array(merge_request.closes_issues(current_user))
|
2016-06-11 14:16:32 +00:00
|
|
|
present paginate(issues), with: issue_entity(user_project), current_user: current_user
|
2016-01-31 09:05:47 +00:00
|
|
|
end
|
2012-10-21 16:48:56 +00:00
|
|
|
end
|
2012-10-21 11:00:27 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|