Download as
Browse Code »

Commit 4281de3640dabe6b913b6b0dc3273d52b6906021

Authored by Valeriy Sizov
1 parent 56bf829c
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

API: review 2

Showing 2 changed files with 4 additions and 4 deletions   Show diff stats
lib/api/entities.rb
  Diff comments   View file @4281de3
@@ -65,8 +65,7 @@ module Gitlab @@ -65,8 +65,7 @@ module Gitlab
65 end 65 end
66 66
67 class MergeRequest < Grape::Entity 67 class MergeRequest < Grape::Entity
68 - expose :id, :target_branch, :source_branch, :project_id,  
69 - :title, :closed, :merged 68 + expose :id, :target_branch, :source_branch, :project_id, :title, :closed, :merged
70 expose :author, :assignee, using: Entities::UserBasic 69 expose :author, :assignee, using: Entities::UserBasic
71 end 70 end
72 71
lib/api/merge_requests.rb
  Diff comments   View file @4281de3
@@ -50,12 +50,12 @@ module Gitlab @@ -50,12 +50,12 @@ module Gitlab
50 # POST /projects/:id/merge_requests 50 # POST /projects/:id/merge_requests
51 # 51 #
52 post ":id/merge_requests" do 52 post ":id/merge_requests" do
  53 + authorize! :write_merge_request, user_project
  54 +
53 attrs = attributes_for_keys [:source_branch, :target_branch, :assignee_id, :title] 55 attrs = attributes_for_keys [:source_branch, :target_branch, :assignee_id, :title]
54 merge_request = user_project.merge_requests.new(attrs) 56 merge_request = user_project.merge_requests.new(attrs)
55 merge_request.author = current_user 57 merge_request.author = current_user
56 58
57 - authorize! :write_merge_request, user_project  
58 -  
59 if merge_request.save 59 if merge_request.save
60 merge_request.reload_code 60 merge_request.reload_code
61 present merge_request, with: Entities::MergeRequest 61 present merge_request, with: Entities::MergeRequest
@@ -105,6 +105,7 @@ module Gitlab @@ -105,6 +105,7 @@ module Gitlab
105 merge_request = user_project.merge_requests.find(params[:merge_request_id]) 105 merge_request = user_project.merge_requests.find(params[:merge_request_id])
106 note = merge_request.notes.new(note: params[:note], project_id: user_project.id) 106 note = merge_request.notes.new(note: params[:note], project_id: user_project.id)
107 note.author = current_user 107 note.author = current_user
  108 +
108 if note.save 109 if note.save
109 present note, with: Entities::Note 110 present note, with: Entities::Note
110 else 111 else