From 99fd58ce4af0e18a6f4252597985269aa5e2b635 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Sat, 15 Feb 2014 14:52:33 +0200
Subject: [PATCH] Show full commit info at MR form

---
 app/assets/stylesheets/sections/merge_requests.scss   |  4 ++--
 app/views/projects/merge_requests/_form.html.haml     | 19 +++++++++++--------
 app/views/projects/merge_requests/branch_from.js.haml |  2 +-
 app/views/projects/merge_requests/branch_to.js.haml   |  2 +-
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/app/assets/stylesheets/sections/merge_requests.scss b/app/assets/stylesheets/sections/merge_requests.scss
index 4388da0..6e21bf0 100644
--- a/app/assets/stylesheets/sections/merge_requests.scss
+++ b/app/assets/stylesheets/sections/merge_requests.scss
@@ -31,10 +31,10 @@
 
 .mr_source_commit,
 .mr_target_commit {
+  margin-top: 10px;
   .commit {
     margin: 0;
-    padding: 0;
-    padding: 5px 0;
+    padding: 2px 0;
     list-style: none;
     &:hover {
       background: none;
diff --git a/app/views/projects/merge_requests/_form.html.haml b/app/views/projects/merge_requests/_form.html.haml
index b9f80c3..7049e31 100644
--- a/app/views/projects/merge_requests/_form.html.haml
+++ b/app/views/projects/merge_requests/_form.html.haml
@@ -6,19 +6,22 @@
           %li= msg
 
   .merge-request-branches
-    .row
-      .col-md-5
+    .form-group
+      = label_tag nil, class: 'control-label' do
+        From
+      .col-sm-10
         .clearfix
           .pull-left
             = f.select(:source_project_id, [[@merge_request.source_project_path,@merge_request.source_project.id]] , {}, { class: 'source_project select2 span3', disabled: @merge_request.persisted? })
           .pull-left
             &nbsp;
             = f.select(:source_branch, @merge_request.source_branches, { include_blank: "Select branch" }, {class: 'source_branch select2 span2'})
-        .mr_source_commit.prepend-top-10
-      .col-md-2
-        .merge-request-angle
-          %i.icon-long-arrow-right
-      .col-md-5
+        .mr_source_commit
+    %br
+    .form-group
+      = label_tag nil, class: 'control-label' do
+        To
+      .col-sm-10
         .clearfix
           .pull-left
             - projects =  @project.forked_from_project.nil? ? [@project] : [ @project,@project.forked_from_project]
@@ -26,7 +29,7 @@
           .pull-left
             &nbsp;
             = f.select(:target_branch, @merge_request.target_branches, { include_blank: "Select branch" }, {class: 'target_branch select2 span2'})
-        .mr_target_commit.prepend-top-10
+        .mr_target_commit
 
   %hr
   .merge-request-form-info
diff --git a/app/views/projects/merge_requests/branch_from.js.haml b/app/views/projects/merge_requests/branch_from.js.haml
index ec4d7f2..d314718 100644
--- a/app/views/projects/merge_requests/branch_from.js.haml
+++ b/app/views/projects/merge_requests/branch_from.js.haml
@@ -1,5 +1,5 @@
 :plain
-  $(".mr_source_commit").html("#{commit_to_html(@commit, @source_project)}");
+  $(".mr_source_commit").html("#{commit_to_html(@commit, @source_project, false)}");
   var mrTitle = $('#merge_request_title');
 
   if(mrTitle.val().length == 0) {
diff --git a/app/views/projects/merge_requests/branch_to.js.haml b/app/views/projects/merge_requests/branch_to.js.haml
index f4e2886..f7ede0d 100644
--- a/app/views/projects/merge_requests/branch_to.js.haml
+++ b/app/views/projects/merge_requests/branch_to.js.haml
@@ -1,2 +1,2 @@
 :plain
-  $(".mr_target_commit").html("#{commit_to_html(@commit, @target_project)}");
+  $(".mr_target_commit").html("#{commit_to_html(@commit, @target_project, false)}");
--
libgit2 0.21.2