Download as
Browse Code »

Commit 4d373005968b8269a8d2fe56b7776820396127a4

Authored by Izaak Alpert
1 parent 0a013adc
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Rebase on master 

-Messed up part of the merge for _form.html.haml
-Probably need discussion about what the new/edit merge page should look like now that it involves projects

Change-Id: I77f3a12ab979578fb4420e0fac6e8bf3fd451fe1
Showing 1 changed file with 4 additions and 4 deletions   Show diff stats
app/views/projects/merge_requests/_form.html.haml
  Diff comments   View file @4d37300
@@ -13,8 +13,8 @@ @@ -13,8 +13,8 @@
13 .span5 13 .span5
14 .light-well 14 .light-well
15 %h5.cgray From 15 %h5.cgray From
16 - .padded= form_helper.select(:source_project_id,[[@merge_request.source_project.path_with_namespace,@merge_request.source_project.id]] , {}, {class: 'source_project chosen span4'})  
17 - .padded= form_helper.select(:source_branch, @merge_request.source_project.repository.branch_names, { include_blank: "Select branch" }, {class: 'source_branch chosen span4'}) 16 + .padded= f.select(:source_project_id,[[@merge_request.source_project.path_with_namespace,@merge_request.source_project.id]] , {}, {class: 'source_project chosen span4'})
  17 + .padded= f.select(:source_branch, @merge_request.source_project.repository.branch_names, { include_blank: "Select branch" }, {class: 'source_branch chosen span4'})
18 .mr_source_commit.prepend-top-10 18 .mr_source_commit.prepend-top-10
19 .span2 19 .span2
20 %h1.merge-request-angle 20 %h1.merge-request-angle
@@ -23,8 +23,8 @@ @@ -23,8 +23,8 @@
23 .light-well 23 .light-well
24 %h5.cgray To 24 %h5.cgray To
25 - projects = @project.forked_from_project.nil? ? [@project] : [ @project,@project.forked_from_project] 25 - projects = @project.forked_from_project.nil? ? [@project] : [ @project,@project.forked_from_project]
26 - .padded= form_helper.select(:target_project_id, projects.map { |proj| [proj.path_with_namespace,proj.id] }, {include_blank: "Select Target Project" }, {class: 'target_project chosen span4'})  
27 - .padded= form_helper.select(:target_branch, @target_branches, { include_blank: "Select branch" }, {class: 'target_branch chosen span4'}) 26 + .padded= f.select(:target_project_id, projects.map { |proj| [proj.path_with_namespace,proj.id] }, {include_blank: "Select Target Project" }, {class: 'target_project chosen span4'})
  27 + .padded= f.select(:target_branch, @target_branches, { include_blank: "Select branch" }, {class: 'target_branch chosen span4'})
28 .mr_target_commit.prepend-top-10 28 .mr_target_commit.prepend-top-10
29 29
30 %hr 30 %hr