Commit f197fa1fbffae2607c01d323aad1a839e086fbbc
1 parent
a8ce107c
Exists in
master
and in
4 other branches
Fix github issue #1153
Showing
4 changed files
with
2 additions
and
5 deletions
Show diff stats
app/views/protected_branches/index.html.haml
| @@ -39,7 +39,7 @@ | @@ -39,7 +39,7 @@ | ||
| 39 | - if branch.name == @project.root_ref | 39 | - if branch.name == @project.root_ref |
| 40 | %span.label default | 40 | %span.label default |
| 41 | %td | 41 | %td |
| 42 | - = link_to project_commits_path(@project, branch.commit.id) do | 42 | + = link_to project_commit_path(@project, branch.commit.id) do |
| 43 | = truncate branch.commit.id.to_s, :length => 10 | 43 | = truncate branch.commit.id.to_s, :length => 10 |
| 44 | = time_ago_in_words(branch.commit.committed_date) | 44 | = time_ago_in_words(branch.commit.committed_date) |
| 45 | ago | 45 | ago |
app/views/repositories/_branch.html.haml
| @@ -3,7 +3,7 @@ | @@ -3,7 +3,7 @@ | ||
| 3 | %tr | 3 | %tr |
| 4 | %td | 4 | %td |
| 5 | = link_to project_commits_path(@project, :ref => branch.name) do | 5 | = link_to project_commits_path(@project, :ref => branch.name) do |
| 6 | - %strong= branch.name | 6 | + %strong= truncate(branch.name, :length => 60) |
| 7 | - if branch.name == @project.root_ref | 7 | - if branch.name == @project.root_ref |
| 8 | %span.label default | 8 | %span.label default |
| 9 | %td | 9 | %td |
| @@ -12,7 +12,6 @@ | @@ -12,7 +12,6 @@ | ||
| 12 | 12 | ||
| 13 | = image_tag gravatar_icon(commit.author_email), :class => "", :width => 16 | 13 | = image_tag gravatar_icon(commit.author_email), :class => "", :width => 16 |
| 14 | = gfm truncate(commit.title, :length => 40) | 14 | = gfm truncate(commit.title, :length => 40) |
| 15 | - %td | ||
| 16 | %span.update-author.right | 15 | %span.update-author.right |
| 17 | = time_ago_in_words(commit.committed_date) | 16 | = time_ago_in_words(commit.committed_date) |
| 18 | ago | 17 | ago |
app/views/repositories/branches.html.haml
app/views/repositories/show.html.haml
| @@ -5,7 +5,6 @@ | @@ -5,7 +5,6 @@ | ||
| 5 | %tr | 5 | %tr |
| 6 | %th Name | 6 | %th Name |
| 7 | %th Last commit | 7 | %th Last commit |
| 8 | - %th Updated at | ||
| 9 | %th | 8 | %th |
| 10 | - @activities.each do |update| | 9 | - @activities.each do |update| |
| 11 | = render "repositories/branch", :branch => update.head | 10 | = render "repositories/branch", :branch => update.head |