2013-05-14 08:33:31 -04:00
|
|
|
module API
|
2012-10-22 14:59:46 -04:00
|
|
|
# MergeRequest API
|
2012-10-21 07:00:27 -04:00
|
|
|
class MergeRequests < Grape::API
|
|
|
|
before { authenticate! }
|
|
|
|
|
2013-09-21 17:46:36 -04:00
|
|
|
resource :projects do
|
2013-02-05 12:36:36 -05:00
|
|
|
helpers do
|
2013-03-05 17:43:05 -05:00
|
|
|
def handle_merge_request_errors!(errors)
|
|
|
|
if errors[:project_access].any?
|
|
|
|
error!(errors[:project_access], 422)
|
2013-03-07 08:51:56 -05:00
|
|
|
elsif errors[:branch_conflict].any?
|
|
|
|
error!(errors[:branch_conflict], 422)
|
2014-08-18 14:09:09 -04:00
|
|
|
elsif errors[:validate_fork].any?
|
|
|
|
error!(errors[:validate_fork], 422)
|
|
|
|
elsif errors[:validate_branches].any?
|
|
|
|
conflict!(errors[:validate_branches])
|
2013-02-05 12:36:36 -05:00
|
|
|
end
|
2014-08-18 14:09:09 -04:00
|
|
|
|
|
|
|
render_api_error!(errors, 400)
|
2013-02-05 12:36:36 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2012-10-22 15:53:06 -04:00
|
|
|
# List merge requests
|
2012-11-29 15:10:07 -05:00
|
|
|
#
|
2012-10-22 15:53:06 -04:00
|
|
|
# Parameters:
|
2012-12-21 12:47:04 -05:00
|
|
|
# id (required) - The ID of a project
|
2014-04-04 12:32:53 -04:00
|
|
|
# state (optional) - Return requests "merged", "opened" or "closed"
|
2012-10-22 15:53:06 -04:00
|
|
|
#
|
|
|
|
# Example:
|
2012-10-25 06:13:01 -04:00
|
|
|
# GET /projects/:id/merge_requests
|
2014-04-04 12:32:53 -04:00
|
|
|
# GET /projects/:id/merge_requests?state=opened
|
|
|
|
# GET /projects/:id/merge_requests?state=closed
|
2014-09-09 11:39:53 -04:00
|
|
|
# GET /projects/:id/merge_requests?order_by=created_at
|
2014-09-16 02:44:50 -04:00
|
|
|
# GET /projects/:id/merge_requests?order_by=updated_at
|
2014-09-09 11:39:53 -04:00
|
|
|
# GET /projects/:id/merge_requests?sort=desc
|
|
|
|
# GET /projects/:id/merge_requests?sort=asc
|
2012-10-22 15:53:06 -04:00
|
|
|
#
|
2012-10-21 07:00:27 -04:00
|
|
|
get ":id/merge_requests" do
|
2012-10-21 09:13:39 -04:00
|
|
|
authorize! :read_merge_request, user_project
|
2012-11-29 15:10:07 -05:00
|
|
|
|
2014-04-04 12:32:53 -04:00
|
|
|
mrs = case params["state"]
|
|
|
|
when "opened" then user_project.merge_requests.opened
|
|
|
|
when "closed" then user_project.merge_requests.closed
|
|
|
|
when "merged" then user_project.merge_requests.merged
|
|
|
|
else user_project.merge_requests
|
2014-05-13 04:01:40 -04:00
|
|
|
end
|
2014-04-04 12:32:53 -04:00
|
|
|
|
2014-09-09 11:39:53 -04:00
|
|
|
sort = case params["sort"]
|
|
|
|
when 'desc' then 'DESC'
|
|
|
|
else 'ASC'
|
|
|
|
end
|
|
|
|
|
|
|
|
mrs = case params["order_by"]
|
|
|
|
when 'updated_at' then mrs.order("updated_at #{sort}")
|
|
|
|
else mrs.order("created_at #{sort}")
|
|
|
|
end
|
|
|
|
|
2014-04-04 12:32:53 -04:00
|
|
|
present paginate(mrs), with: Entities::MergeRequest
|
2012-10-21 07:00:27 -04:00
|
|
|
end
|
2012-11-29 15:10:07 -05:00
|
|
|
|
2012-10-22 15:53:06 -04:00
|
|
|
# Show MR
|
2012-11-29 15:10:07 -05:00
|
|
|
#
|
2012-10-22 15:53:06 -04:00
|
|
|
# Parameters:
|
2012-12-21 12:47:04 -05:00
|
|
|
# id (required) - The ID of a project
|
2012-10-22 15:53:06 -04:00
|
|
|
# merge_request_id (required) - The ID of MR
|
2012-11-29 15:10:07 -05:00
|
|
|
#
|
2012-10-22 15:53:06 -04:00
|
|
|
# Example:
|
2012-10-25 06:13:01 -04:00
|
|
|
# GET /projects/:id/merge_request/:merge_request_id
|
2012-10-22 15:53:06 -04:00
|
|
|
#
|
2012-10-21 07:00:27 -04:00
|
|
|
get ":id/merge_request/:merge_request_id" do
|
2012-10-21 09:13:39 -04:00
|
|
|
merge_request = user_project.merge_requests.find(params[:merge_request_id])
|
2012-11-29 15:10:07 -05:00
|
|
|
|
2012-10-21 09:13:39 -04:00
|
|
|
authorize! :read_merge_request, merge_request
|
2012-11-29 15:10:07 -05:00
|
|
|
|
2012-10-21 09:13:39 -04:00
|
|
|
present merge_request, with: Entities::MergeRequest
|
2012-10-21 07:00:27 -04:00
|
|
|
end
|
|
|
|
|
2012-10-22 15:53:06 -04:00
|
|
|
# Create MR
|
|
|
|
#
|
|
|
|
# Parameters:
|
|
|
|
#
|
2013-04-25 10:15:33 -04:00
|
|
|
# id (required) - The ID of a project - this will be the source of the merge request
|
2012-10-22 15:53:06 -04:00
|
|
|
# source_branch (required) - The source branch
|
|
|
|
# target_branch (required) - The target branch
|
2013-04-25 10:15:33 -04:00
|
|
|
# target_project - The target project of the merge request defaults to the :id of the project
|
2012-10-22 15:53:06 -04:00
|
|
|
# assignee_id - Assignee user ID
|
|
|
|
# title (required) - Title of MR
|
2014-03-04 02:08:39 -05:00
|
|
|
# description - Description of MR
|
2014-04-14 21:12:07 -04:00
|
|
|
# labels (optional) - Labels for MR as a comma-separated list
|
2012-11-29 15:10:07 -05:00
|
|
|
#
|
2012-10-22 15:53:06 -04:00
|
|
|
# Example:
|
2012-10-25 06:13:01 -04:00
|
|
|
# POST /projects/:id/merge_requests
|
2012-10-22 15:53:06 -04:00
|
|
|
#
|
2012-10-21 07:00:27 -04:00
|
|
|
post ":id/merge_requests" do
|
2014-04-02 14:51:53 -04:00
|
|
|
authorize! :write_merge_request, user_project
|
|
|
|
required_attributes! [:source_branch, :target_branch, :title]
|
|
|
|
attrs = attributes_for_keys [:source_branch, :target_branch, :assignee_id, :title, :target_project_id, :description]
|
2014-08-14 04:17:52 -04:00
|
|
|
|
|
|
|
# Validate label names in advance
|
2014-08-20 14:34:55 -04:00
|
|
|
if (errors = validate_label_params(params)).any?
|
|
|
|
render_api_error!({ labels: errors }, 400)
|
2014-08-14 04:17:52 -04:00
|
|
|
end
|
|
|
|
|
2014-04-02 14:51:53 -04:00
|
|
|
merge_request = ::MergeRequests::CreateService.new(user_project, current_user, attrs).execute
|
2013-07-17 11:23:36 -04:00
|
|
|
|
2014-04-02 14:51:53 -04:00
|
|
|
if merge_request.valid?
|
2014-07-30 10:17:29 -04:00
|
|
|
# Find or create labels and attach to issue
|
|
|
|
if params[:labels].present?
|
|
|
|
merge_request.add_labels_by_names(params[:labels].split(","))
|
|
|
|
end
|
|
|
|
|
2014-04-02 14:51:53 -04:00
|
|
|
present merge_request, with: Entities::MergeRequest
|
|
|
|
else
|
|
|
|
handle_merge_request_errors! merge_request.errors
|
2012-10-21 07:41:06 -04:00
|
|
|
end
|
2012-10-21 07:00:27 -04:00
|
|
|
end
|
|
|
|
|
2012-10-22 15:53:06 -04:00
|
|
|
# Update MR
|
|
|
|
#
|
|
|
|
# Parameters:
|
2012-12-21 12:47:04 -05:00
|
|
|
# id (required) - The ID of a project
|
2012-10-22 15:53:06 -04:00
|
|
|
# merge_request_id (required) - ID of MR
|
|
|
|
# source_branch - The source branch
|
|
|
|
# target_branch - The target branch
|
|
|
|
# assignee_id - Assignee user ID
|
|
|
|
# title - Title of MR
|
2013-02-18 04:07:49 -05:00
|
|
|
# state_event - Status of MR. (close|reopen|merge)
|
2014-03-04 02:08:39 -05:00
|
|
|
# description - Description of MR
|
2014-04-14 21:12:07 -04:00
|
|
|
# labels (optional) - Labels for a MR as a comma-separated list
|
2012-10-22 15:53:06 -04:00
|
|
|
# Example:
|
2012-10-25 06:13:01 -04:00
|
|
|
# PUT /projects/:id/merge_request/:merge_request_id
|
2012-10-22 15:53:06 -04:00
|
|
|
#
|
2012-10-21 07:00:27 -04:00
|
|
|
put ":id/merge_request/:merge_request_id" do
|
2014-04-02 14:51:53 -04:00
|
|
|
attrs = attributes_for_keys [:source_branch, :target_branch, :assignee_id, :title, :state_event, :description]
|
|
|
|
merge_request = user_project.merge_requests.find(params[:merge_request_id])
|
|
|
|
authorize! :modify_merge_request, merge_request
|
2014-08-14 04:17:52 -04:00
|
|
|
|
|
|
|
# Validate label names in advance
|
2014-08-20 14:34:55 -04:00
|
|
|
if (errors = validate_label_params(params)).any?
|
2015-01-07 05:39:20 -05:00
|
|
|
render_api_error!({ labels: errors }, 400)
|
2014-08-14 04:17:52 -04:00
|
|
|
end
|
|
|
|
|
2014-04-02 14:51:53 -04:00
|
|
|
merge_request = ::MergeRequests::UpdateService.new(user_project, current_user, attrs).execute(merge_request)
|
2012-11-29 15:10:07 -05:00
|
|
|
|
2014-04-02 14:51:53 -04:00
|
|
|
if merge_request.valid?
|
2014-07-30 10:17:29 -04:00
|
|
|
# Find or create labels and attach to issue
|
2014-08-20 14:34:55 -04:00
|
|
|
unless params[:labels].nil?
|
|
|
|
merge_request.remove_labels
|
2014-07-30 10:17:29 -04:00
|
|
|
merge_request.add_labels_by_names(params[:labels].split(","))
|
|
|
|
end
|
|
|
|
|
2014-04-02 14:51:53 -04:00
|
|
|
present merge_request, with: Entities::MergeRequest
|
|
|
|
else
|
|
|
|
handle_merge_request_errors! merge_request.errors
|
2012-10-21 07:59:50 -04:00
|
|
|
end
|
2012-10-21 07:00:27 -04:00
|
|
|
end
|
|
|
|
|
2014-05-12 09:34:41 -04: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
|
|
|
|
# Example:
|
|
|
|
# PUT /projects/:id/merge_request/:merge_request_id/merge
|
|
|
|
#
|
|
|
|
put ":id/merge_request/:merge_request_id/merge" do
|
|
|
|
merge_request = user_project.merge_requests.find(params[:merge_request_id])
|
|
|
|
|
|
|
|
action = if user_project.protected_branch?(merge_request.target_branch)
|
|
|
|
:push_code_to_protected_branches
|
|
|
|
else
|
|
|
|
:push_code
|
|
|
|
end
|
|
|
|
|
2014-05-13 04:01:40 -04:00
|
|
|
if can?(current_user, action, user_project)
|
2014-05-12 09:34:41 -04:00
|
|
|
if merge_request.unchecked?
|
|
|
|
merge_request.check_if_can_be_merged
|
|
|
|
end
|
|
|
|
|
2014-05-12 10:51:43 -04:00
|
|
|
if merge_request.open?
|
|
|
|
if merge_request.can_be_merged?
|
|
|
|
merge_request.automerge!(current_user, params[:merge_commit_message] || merge_request.merge_commit_message)
|
2014-05-12 11:01:22 -04:00
|
|
|
present merge_request, with: Entities::MergeRequest
|
2014-05-12 10:51:43 -04:00
|
|
|
else
|
|
|
|
render_api_error!('Branch cannot be merged', 405)
|
|
|
|
end
|
2014-05-12 09:34:41 -04:00
|
|
|
else
|
2014-05-12 10:51:43 -04:00
|
|
|
# Merge request can not be merged
|
|
|
|
# because it is already closed/merged
|
|
|
|
not_allowed!
|
2014-05-12 09:34:41 -04:00
|
|
|
end
|
|
|
|
else
|
2014-05-12 10:51:43 -04:00
|
|
|
# Merge request can not be merged
|
|
|
|
# because user dont have permissions to push into target branch
|
|
|
|
unauthorized!
|
2014-05-12 09:34:41 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
2014-03-19 14:07:51 -04:00
|
|
|
# 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_request/:merge_request_id/comments
|
|
|
|
#
|
|
|
|
get ":id/merge_request/:merge_request_id/comments" do
|
|
|
|
merge_request = user_project.merge_requests.find(params[:merge_request_id])
|
|
|
|
|
|
|
|
authorize! :read_merge_request, merge_request
|
|
|
|
|
|
|
|
present paginate(merge_request.notes), with: Entities::MRNote
|
|
|
|
end
|
|
|
|
|
2012-10-22 15:53:06 -04:00
|
|
|
# Post comment to merge request
|
|
|
|
#
|
|
|
|
# Parameters:
|
2012-12-21 12:47:04 -05:00
|
|
|
# id (required) - The ID of a project
|
2012-10-22 15:53:06 -04:00
|
|
|
# merge_request_id (required) - ID of MR
|
|
|
|
# note (required) - Text of comment
|
2012-11-29 15:10:07 -05:00
|
|
|
# Examples:
|
2012-10-25 06:13:01 -04:00
|
|
|
# POST /projects/:id/merge_request/:merge_request_id/comments
|
2012-10-22 15:53:06 -04:00
|
|
|
#
|
2012-10-21 12:48:56 -04:00
|
|
|
post ":id/merge_request/:merge_request_id/comments" do
|
2014-06-10 10:56:35 -04:00
|
|
|
required_attributes! [:note]
|
2013-02-27 09:07:42 -05:00
|
|
|
|
2014-06-10 10:56:35 -04:00
|
|
|
merge_request = user_project.merge_requests.find(params[:merge_request_id])
|
|
|
|
note = merge_request.notes.new(note: params[:note], project_id: user_project.id)
|
|
|
|
note.author = current_user
|
2012-10-25 06:38:55 -04:00
|
|
|
|
2014-06-10 10:56:35 -04:00
|
|
|
if note.save
|
|
|
|
present note, with: Entities::MRNote
|
|
|
|
else
|
2015-01-07 04:46:00 -05:00
|
|
|
render_api_error!("Failed to save note #{note.errors.messages}", 400)
|
2012-10-21 12:48:56 -04:00
|
|
|
end
|
|
|
|
end
|
2012-10-21 07:00:27 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|