From f197fa1fbffae2607c01d323aad1a839e086fbbc Mon Sep 17 00:00:00 2001
From: randx <dmitriy.zaporozhets@gmail.com>
Date: Wed, 8 Aug 2012 17:08:43 +0300
Subject: [PATCH] Fix github issue #1153

---
 app/views/protected_branches/index.html.haml | 2 +-
 app/views/repositories/_branch.html.haml     | 3 +--
 app/views/repositories/branches.html.haml    | 1 -
 app/views/repositories/show.html.haml        | 1 -
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/views/protected_branches/index.html.haml b/app/views/protected_branches/index.html.haml
index bd1e9ceb..586d4f63 100644
--- a/app/views/protected_branches/index.html.haml
+++ b/app/views/protected_branches/index.html.haml
@@ -39,7 +39,7 @@
               - if branch.name == @project.root_ref
                 %span.label default
           %td
-            = link_to project_commits_path(@project, branch.commit.id) do
+            = link_to project_commit_path(@project, branch.commit.id) do
               = truncate branch.commit.id.to_s, :length => 10
             = time_ago_in_words(branch.commit.committed_date)
             ago
diff --git a/app/views/repositories/_branch.html.haml b/app/views/repositories/_branch.html.haml
index 6b2698d9..b67c4026 100644
--- a/app/views/repositories/_branch.html.haml
+++ b/app/views/repositories/_branch.html.haml
@@ -3,7 +3,7 @@
 %tr
   %td
     = link_to project_commits_path(@project, :ref => branch.name) do
-      %strong= branch.name
+      %strong= truncate(branch.name, :length => 60)
       - if branch.name == @project.root_ref
         %span.label default
   %td
@@ -12,7 +12,6 @@
 
     = image_tag gravatar_icon(commit.author_email), :class => "", :width => 16
     = gfm truncate(commit.title, :length => 40)
-  %td
     %span.update-author.right
       = time_ago_in_words(commit.committed_date)
       ago
diff --git a/app/views/repositories/branches.html.haml b/app/views/repositories/branches.html.haml
index 52c0bf8e..f4cf9193 100644
--- a/app/views/repositories/branches.html.haml
+++ b/app/views/repositories/branches.html.haml
@@ -5,7 +5,6 @@
       %tr
         %th Name
         %th Last commit
-        %th Updated at
         %th
 
     %tbody
diff --git a/app/views/repositories/show.html.haml b/app/views/repositories/show.html.haml
index ceb971a4..add3324e 100644
--- a/app/views/repositories/show.html.haml
+++ b/app/views/repositories/show.html.haml
@@ -5,7 +5,6 @@
     %tr
       %th Name
       %th Last commit
-      %th Updated at
       %th
   - @activities.each do |update|
     = render "repositories/branch", :branch => update.head