Merge branch 'improve-mr-tabs' into 'master'

Improve merge request page UX

Increase Discussions and Changes tabs size. Added count of changes and comment to it

Before and after:

![Screenshot 2014-05-27 12.08.42](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/31fe70c9be/Screenshot_2014-05-27_12.08.42.png)

app/assets/stylesheets/sections/merge_requests.scss

@@ -19,12 +19,19 @@
   }
 }
 
-.merge-request .nav-tabs{
+.merge-request .merge-request-tabs{
+  border-color: #AAA;
   li {
     a {
-      font-weight: bold;
-      padding: 8px 20px;
-      text-align: center;
+      border-color: #AAA;
+      padding: 14px 40px;
+      font-size: 14px;
+      background-color: #F9F9F9;
+    }
+    &.active a {
+      border-color: #AAA;
+      border-bottom-color: #FFF;
+      background-color: #FFF;
     }
   }
 }

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

@@ -12,10 +12,12 @@
         = link_to project_merge_request_path(@project, @merge_request) do
           %i.icon-comment
           Discussion
+          %span.badge= @merge_request.mr_and_commit_notes.count
       %li.diffs-tab{data: {action: 'diffs'}}
         = link_to diffs_project_merge_request_path(@project, @merge_request) do
           %i.icon-list-alt
           Changes
+          %span.badge= @merge_request.diffs.size
 
   - content_for :note_actions do
     - if can?(current_user, :modify_merge_request, @merge_request)