diff options
| author | randx <dmitriy.zaporozhets@gmail.com> | 2012-08-12 01:33:32 +0400 |
|---|---|---|
| committer | randx <dmitriy.zaporozhets@gmail.com> | 2012-08-12 01:33:32 +0400 |
| commit | bd0c971aa96c7f60b199c968b023b17e013a6ead (patch) | |
| tree | af11cbb944738eace7ebb56f4d3de4c7c620f34e /app | |
| parent | 28d903858e1ba491bcb75a5534db9eea1acdeaf0 (diff) | |
| parent | 15fc0f0c103f41a517c04913efc03e224f5efbac (diff) | |
Merge branch 'fix_commits_dashboard' of https://github.com/jouve/gitlabhq into jouve-fix_commits_dashboard
Conflicts:
app/views/events/_commit.html.haml
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/events/_commit.html.haml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/views/events/_commit.html.haml b/app/views/events/_commit.html.haml index 15f3bb5a97d..79df0cfb00b 100644 --- a/app/views/events/_commit.html.haml +++ b/app/views/events/_commit.html.haml @@ -5,5 +5,4 @@ %strong.cdark= commit.author_name – = image_tag gravatar_icon(commit.author_email), class: "avatar", width: 16 - = gfm truncate(commit.title, length: 50), project_commit_path(project, id: commit.id) rescue "--broken encoding" - + = gfm truncate(commit.title, length: 50) rescue "--broken encoding" |