diff options
| author | Izaak Alpert <ialpert@blackberry.com> | 2013-06-08 11:51:18 -0400 |
|---|---|---|
| committer | Izaak Alpert <ialpert@blackberry.com> | 2013-07-17 22:45:03 -0400 |
| commit | bbef8bb5896d8858bf91692bdd5aa9236472a885 (patch) | |
| tree | 2ea87d6386e679e6589b049e7e97f99453eb77b0 /app/controllers | |
| parent | 216d5e2c1adb8470421a99943f09c45e4e515d5b (diff) | |
| download | gitlab-ce-bbef8bb5896d8858bf91692bdd5aa9236472a885.tar.gz | |
MR on fork validation error
Wasn't setting fields so validations would fail
Change-Id: I0363c57bf6c8b9937cc1b4140d09071d7c5168c2
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 5bbf52beed9..11f7f0bee9e 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -70,7 +70,9 @@ class Projects::MergeRequestsController < Projects::ApplicationController @merge_request.reload_code redirect_to [@merge_request.target_project, @merge_request], notice: 'Merge request was successfully created.' else - render "new" + @source_project = @merge_request.source_project + @target_project = @merge_request.target_project + render action: "new" end end @@ -118,7 +120,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController def update_branches @target_project = selected_target_project - @target_branches = (@target_project.repository.branch_names).unshift("Select branch") + @target_branches = @target_project.repository.branch_names @target_branches end |