Download as
Browse Code »

Commit f197fa1fbffae2607c01d323aad1a839e086fbbc

Authored by randx
1 parent a8ce107c
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Fix github issue #1153

Showing 4 changed files with 2 additions and 5 deletions   Show diff stats
app/views/protected_branches/index.html.haml
  Diff comments   View file @f197fa1
... ... @@ -39,7 +39,7 @@
39 39 - if branch.name == @project.root_ref
40 40 %span.label default
41 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 43 = truncate branch.commit.id.to_s, :length => 10
44 44 = time_ago_in_words(branch.commit.committed_date)
45 45 ago
... ...
app/views/repositories/_branch.html.haml
  Diff comments   View file @f197fa1
... ... @@ -3,7 +3,7 @@
3 3 %tr
4 4 %td
5 5 = link_to project_commits_path(@project, :ref => branch.name) do
6   - %strong= branch.name
  6 + %strong= truncate(branch.name, :length => 60)
7 7 - if branch.name == @project.root_ref
8 8 %span.label default
9 9 %td
... ... @@ -12,7 +12,6 @@
12 12  
13 13 = image_tag gravatar_icon(commit.author_email), :class => "", :width => 16
14 14 = gfm truncate(commit.title, :length => 40)
15   - %td
16 15 %span.update-author.right
17 16 = time_ago_in_words(commit.committed_date)
18 17 ago
... ...
app/views/repositories/branches.html.haml
  Diff comments   View file @f197fa1
... ... @@ -5,7 +5,6 @@
5 5 %tr
6 6 %th Name
7 7 %th Last commit
8   - %th Updated at
9 8 %th
10 9  
11 10 %tbody
... ...
app/views/repositories/show.html.haml
  Diff comments   View file @f197fa1
... ... @@ -5,7 +5,6 @@
5 5 %tr
6 6 %th Name
7 7 %th Last commit
8   - %th Updated at
9 8 %th
10 9 - @activities.each do |update|
11 10 = render "repositories/branch", :branch => update.head
... ...