Merge branch 'master' of github.com:gitlabhq/gitlabhq

diff --cc app/views/merge_requests/show.html.haml
index 7b9e31d,6b9ade4..3db2477
--- 1/app/views/merge_requests/show.html.haml
--- 2/app/views/merge_requests/show.html.haml
+++ b/app/views/merge_requests/show.html.haml
@@@ -11,14 -11,16 +11,14 @@@
  
    %span.right
      - if can?(current_user, :modify_merge_request, @merge_request)
 -      - if @merge_request.closed
 -        = link_to 'Reopen', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => false }, :status_only => true), :method => :put,  :class => "btn"
 -      - else
 +      - if @merge_request.open?
          = link_to 'Close', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => true }, :status_only => true), :method => :put, :class => "btn", :title => "Close merge request"
 -      = link_to edit_project_merge_request_path(@project, @merge_request), :class => "btn" do 
 -        Edit
 +        = link_to edit_project_merge_request_path(@project, @merge_request), :class => "btn" do 
 +          Edit
  
+     %br
      - if @merge_request.upvotes > 0
-       = link_to "#notes", :class => "btn success" do
-         +#{@merge_request.upvotes}
+       .upvotes#upvotes= "+#{pluralize @merge_request.upvotes, 'upvote'}"
  
  .back_link
    = link_to project_merge_requests_path(@project) do