Download as
Browse Code »

Commit 524b907042c36d832b82d980c9fee85e6d92b6da

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

API: MergeRequest refactoring

Showing 1 changed file with 4 additions and 8 deletions   Show diff stats
lib/api/merge_requests.rb
  Diff comments   View file @524b907
... ... @@ -6,21 +6,18 @@ module Gitlab
6 6 resource :projects do
7 7 #list
8 8 get ":id/merge_requests" do
9   - project = current_user.projects.find(params[:id])
10   - present project.merge_requests, with: Entities::MergeRequest
  9 + present user_project.merge_requests, with: Entities::MergeRequest
11 10 end
12 11  
13 12 #show
14 13 get ":id/merge_request/:merge_request_id" do
15   - project = current_user.projects.find(params[:id])
16   - present project.merge_requests.find(params[:merge_request_id]), with: Entities::MergeRequest
  14 + present user_project.merge_requests.find(params[:merge_request_id]), with: Entities::MergeRequest
17 15 end
18 16  
19 17 #create merge_request
20 18 post ":id/merge_requests" do
21 19 attrs = attributes_for_keys [:source_branch, :target_branch, :assignee_id, :title]
22   - project = current_user.projects.find(params[:id])
23   - merge_request = project.merge_requests.new(attrs)
  20 + merge_request = user_project.merge_requests.new(attrs)
24 21 merge_request.author = current_user
25 22  
26 23 if merge_request.save
... ... @@ -34,8 +31,7 @@ module Gitlab
34 31 #update merge_request
35 32 put ":id/merge_request/:merge_request_id" do
36 33 attrs = attributes_for_keys [:source_branch, :target_branch, :assignee_id, :title, :closed]
37   - project = current_user.projects.find(params[:id])
38   - merge_request = project.merge_requests.find(params[:merge_request_id])
  34 + merge_request = user_project.merge_requests.find(params[:merge_request_id])
39 35  
40 36 if merge_request.update_attributes attrs
41 37 merge_request.reload_code
... ...