Commit 0e82c98174618c77e75153884269b5a02850c1d0
1 parent
fae3f466
Exists in
master
and in
4 other branches
Fix merge_requests_controller
-update new to be simplified (set values from parms via rails) instead of doing it by hand -change def merge_request to look up the merge request against the current @project Change-Id: I778c91b87c6da84b73f8f59013c27b74d290d8b1
Showing
1 changed file
with
4 additions
and
11 deletions
Show diff stats
app/controllers/projects/merge_requests_controller.rb
| @@ -39,16 +39,9 @@ class Projects::MergeRequestsController < Projects::ApplicationController | @@ -39,16 +39,9 @@ class Projects::MergeRequestsController < Projects::ApplicationController | ||
| 39 | end | 39 | end |
| 40 | 40 | ||
| 41 | def new | 41 | def new |
| 42 | - @merge_request = @project.merge_requests.new(params[:merge_request]) | ||
| 43 | - | ||
| 44 | - if params[:merge_request] && params[:merge_request][:source_project_id] | ||
| 45 | - @merge_request.source_project = Project.find_by_id(params[:merge_request][:source_project_id]) | ||
| 46 | - else | ||
| 47 | - @merge_request.source_project = @project | ||
| 48 | - end | ||
| 49 | - if params[:merge_request] && params[:merge_request][:target_project_id] | ||
| 50 | - @merge_request.target_project = Project.find_by_id(params[:merge_request][:target_project_id]) | ||
| 51 | - end | 42 | + @merge_request = MergeRequest.new(params[:merge_request]) |
| 43 | + @merge_request.source_project = @project unless @merge_request.source_project | ||
| 44 | + @merge_request.target_project = @project unless @merge_request.target_project | ||
| 52 | @target_branches = @merge_request.target_project.nil? ? [] : @merge_request.target_project.repository.branch_names | 45 | @target_branches = @merge_request.target_project.nil? ? [] : @merge_request.target_project.repository.branch_names |
| 53 | @source_project = @merge_request.source_project | 46 | @source_project = @merge_request.source_project |
| 54 | @merge_request | 47 | @merge_request |
| @@ -138,7 +131,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController | @@ -138,7 +131,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController | ||
| 138 | end | 131 | end |
| 139 | 132 | ||
| 140 | def merge_request | 133 | def merge_request |
| 141 | - @merge_request ||= MergeRequest.find_by_id(params[:id]) | 134 | + @merge_request ||= @project.merge_requests.find(params[:id]) |
| 142 | end | 135 | end |
| 143 | 136 | ||
| 144 | def authorize_modify_merge_request! | 137 | def authorize_modify_merge_request! |