Move command line insturction out of mr widget

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

app/assets/stylesheets/pages/merge_requests.scss

@@ -61,23 +61,10 @@
 }
 
 .label-branch {
-  @include border-radius(4px);
-  padding: 3px 4px;
-  border: none;
-  background: $hover;
-  color: #333;
+  color: #222;
   font-family: $monospace_font;
-  font-weight: normal;
+  font-weight: bold;
   overflow: hidden;
-
-  .label-project {
-    @include border-radius-left(4px);
-    padding: 3px 4px;
-    background: #279;
-    position: relative;
-    left: -4px;
-    letter-spacing: -1px;
-  }
 }
 
 .mr-list {

app/helpers/merge_requests_helper.rb

@@ -61,4 +61,14 @@ module MergeRequestsHelper
       }
     )
   end
+
+  def source_branch_with_namespace(merge_request)
+    if merge_request.for_fork?
+      namespace = link_to(merge_request.source_project_namespace,
+        project_path(merge_request.source_project))
+      namespace + ":#{merge_request.source_branch}"
+    else
+      merge_request.source_branch
+    end
+  end
 end

app/views/projects/merge_requests/_show.html.haml

@@ -6,30 +6,25 @@
     = render "projects/merge_requests/show/mr_box"
     %hr
     .append-bottom-20
-      .slead
-        %span From
-        - if @merge_request.for_fork?
-          %strong.label-branch<
-            - if @merge_request.source_project
-              = link_to @merge_request.source_project_namespace, namespace_project_path(@merge_request.source_project.namespace, @merge_request.source_project)
-            - else
-              \ #{@merge_request.source_project_namespace}
-            \:#{@merge_request.source_branch}
+      - if @merge_request.open?
+        .btn-group.btn-group-sm.pull-right
+          %a.btn.btn-sm.dropdown-toggle{ data: {toggle: :dropdown} }
+            = icon('download')
+            Download as
+            %span.caret
+          %ul.dropdown-menu
+            %li= link_to "Email Patches", merge_request_path(@merge_request, format: :patch)
+            %li= link_to "Plain Diff",    merge_request_path(@merge_request, format: :diff)
+      .light
+        %div
+          %span From
+          %span.label-branch #{source_branch_with_namespace(@merge_request)}
           %span into
-          %strong.label-branch #{@merge_request.target_project_namespace}:#{@merge_request.target_branch}
-        - else
-          %strong.label-branch #{@merge_request.source_branch}
-          %span into
-          %strong.label-branch #{@merge_request.target_branch}
-        - if @merge_request.open?
-          .btn-group.btn-group-sm.pull-right
-            %a.btn.btn-sm.dropdown-toggle{ data: {toggle: :dropdown} }
-              = icon('download')
-              Download as
-              %span.caret
-            %ul.dropdown-menu
-              %li= link_to "Email Patches", merge_request_path(@merge_request, format: :patch)
-              %li= link_to "Plain Diff",    merge_request_path(@merge_request, format: :diff)
+          %span.label-branch #{@merge_request.target_branch}
+        - if @merge_request.open? && !@merge_request.branch_missing?
+          %div
+            If you want to try or merge this request manually, you can use the
+            = link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal"
 
     - if @merge_request.open? and @merge_request.source_branch_exists?
       .append-bottom-20