Download as
Browse Code »

Commit 99fd58ce4af0e18a6f4252597985269aa5e2b635

Authored by Dmitriy Zaporozhets
1 parent 1e106756
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Show full commit info at MR form 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 4 changed files with 15 additions and 12 deletions   Show diff stats
app/assets/stylesheets/sections/merge_requests.scss
  Diff comments   View file @99fd58c
@@ -31,10 +31,10 @@ @@ -31,10 +31,10 @@
31 31
32 .mr_source_commit, 32 .mr_source_commit,
33 .mr_target_commit { 33 .mr_target_commit {
  34 + margin-top: 10px;
34 .commit { 35 .commit {
35 margin: 0; 36 margin: 0;
36 - padding: 0;  
37 - padding: 5px 0; 37 + padding: 2px 0;
38 list-style: none; 38 list-style: none;
39 &:hover { 39 &:hover {
40 background: none; 40 background: none;
app/views/projects/merge_requests/_form.html.haml
  Diff comments   View file @99fd58c
@@ -6,19 +6,22 @@ @@ -6,19 +6,22 @@
6 %li= msg 6 %li= msg
7 7
8 .merge-request-branches 8 .merge-request-branches
9 - .row  
10 - .col-md-5 9 + .form-group
  10 + = label_tag nil, class: 'control-label' do
  11 + From
  12 + .col-sm-10
11 .clearfix 13 .clearfix
12 .pull-left 14 .pull-left
13 = f.select(:source_project_id, [[@merge_request.source_project_path,@merge_request.source_project.id]] , {}, { class: 'source_project select2 span3', disabled: @merge_request.persisted? }) 15 = f.select(:source_project_id, [[@merge_request.source_project_path,@merge_request.source_project.id]] , {}, { class: 'source_project select2 span3', disabled: @merge_request.persisted? })
14 .pull-left 16 .pull-left
15 &nbsp; 17 &nbsp;
16 = f.select(:source_branch, @merge_request.source_branches, { include_blank: "Select branch" }, {class: 'source_branch select2 span2'}) 18 = f.select(:source_branch, @merge_request.source_branches, { include_blank: "Select branch" }, {class: 'source_branch select2 span2'})
17 - .mr_source_commit.prepend-top-10  
18 - .col-md-2  
19 - .merge-request-angle  
20 - %i.icon-long-arrow-right  
21 - .col-md-5 19 + .mr_source_commit
  20 + %br
  21 + .form-group
  22 + = label_tag nil, class: 'control-label' do
  23 + To
  24 + .col-sm-10
22 .clearfix 25 .clearfix
23 .pull-left 26 .pull-left
24 - projects = @project.forked_from_project.nil? ? [@project] : [ @project,@project.forked_from_project] 27 - projects = @project.forked_from_project.nil? ? [@project] : [ @project,@project.forked_from_project]
@@ -26,7 +29,7 @@ @@ -26,7 +29,7 @@
26 .pull-left 29 .pull-left
27 &nbsp; 30 &nbsp;
28 = f.select(:target_branch, @merge_request.target_branches, { include_blank: "Select branch" }, {class: 'target_branch select2 span2'}) 31 = f.select(:target_branch, @merge_request.target_branches, { include_blank: "Select branch" }, {class: 'target_branch select2 span2'})
29 - .mr_target_commit.prepend-top-10 32 + .mr_target_commit
30 33
31 %hr 34 %hr
32 .merge-request-form-info 35 .merge-request-form-info
app/views/projects/merge_requests/branch_from.js.haml
  Diff comments   View file @99fd58c
1 :plain 1 :plain
2 - $(".mr_source_commit").html("#{commit_to_html(@commit, @source_project)}"); 2 + $(".mr_source_commit").html("#{commit_to_html(@commit, @source_project, false)}");
3 var mrTitle = $('#merge_request_title'); 3 var mrTitle = $('#merge_request_title');
4 4
5 if(mrTitle.val().length == 0) { 5 if(mrTitle.val().length == 0) {
app/views/projects/merge_requests/branch_to.js.haml
  Diff comments   View file @99fd58c
1 :plain 1 :plain
2 - $(".mr_target_commit").html("#{commit_to_html(@commit, @target_project)}"); 2 + $(".mr_target_commit").html("#{commit_to_html(@commit, @target_project, false)}");