deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

API: review 2

Browse source
This commit is contained in:
Valeriy Sizov 2012-10-25 13:38:55 +03:00
parent 56bf829c75
commit 4281de3640
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/api/entities.rb
View file

@ -65,8 +65,7 @@ module Gitlab
end end
class MergeRequest < Grape::Entity class MergeRequest < Grape::Entity
expose :id, :target_branch, :source_branch, :project_id, expose :id, :target_branch, :source_branch, :project_id, :title, :closed, :merged
:title, :closed, :merged
expose :author, :assignee, using: Entities::UserBasic expose :author, :assignee, using: Entities::UserBasic
end end

5
lib/api/merge_requests.rb
View file

@ -50,12 +50,12 @@ module Gitlab
# POST /projects/:id/merge_requests # POST /projects/:id/merge_requests
# #
post ":id/merge_requests" do post ":id/merge_requests" do
authorize! :write_merge_request, user_project
attrs = attributes_for_keys [:source_branch, :target_branch, :assignee_id, :title] attrs = attributes_for_keys [:source_branch, :target_branch, :assignee_id, :title]
merge_request = user_project.merge_requests.new(attrs) merge_request = user_project.merge_requests.new(attrs)
merge_request.author = current_user merge_request.author = current_user
authorize! :write_merge_request, user_project
if merge_request.save if merge_request.save
merge_request.reload_code merge_request.reload_code
present merge_request, with: Entities::MergeRequest present merge_request, with: Entities::MergeRequest
@ -105,6 +105,7 @@ module Gitlab
merge_request = user_project.merge_requests.find(params[:merge_request_id]) 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 = merge_request.notes.new(note: params[:note], project_id: user_project.id)
note.author = current_user note.author = current_user
if note.save if note.save
present note, with: Entities::Note present note, with: Entities::Note
else else