diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-30 11:35:40 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-30 11:35:40 +0300 |
| commit | f438bd415ffc4405c2e81360a92ffaf907cd87ad (patch) | |
| tree | 6543a5114236effcba0dc3f4ac307b7d33d65cc3 /app/views/projects/repositories | |
| parent | 0904cc485c23385e4ac0628ddce5e1c842909af4 (diff) | |
| parent | d9c02f30e56592986b98bcbf8e7c1abd712b696f (diff) | |
| download | gitlab-ce-f438bd415ffc4405c2e81360a92ffaf907cd87ad.tar.gz | |
Merge branch 'master' into 6-0-dev
Conflicts:
app/controllers/admin/teams/projects_controller.rb
app/views/team_members/_team_member.html.haml
app/views/teams/members/_member.html.haml
Diffstat (limited to 'app/views/projects/repositories')
| -rw-r--r-- | app/views/projects/repositories/_branch.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/repositories/_feed.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/repositories/stats.html.haml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/repositories/_branch.html.haml b/app/views/projects/repositories/_branch.html.haml index dd91e14b66b..2115f3c427f 100644 --- a/app/views/projects/repositories/_branch.html.haml +++ b/app/views/projects/repositories/_branch.html.haml @@ -12,7 +12,7 @@ %td = link_to project_commit_path(@project, commit.id), class: 'commit_short_id' do = commit.short_id - = image_tag gravatar_icon(commit.author_email), class: "avatar s16" + = image_tag gravatar_icon(commit.author_email), class: "avatar s16", alt: '' %span.light = gfm escape_once(truncate(commit.title, length: 40)) %span diff --git a/app/views/projects/repositories/_feed.html.haml b/app/views/projects/repositories/_feed.html.haml index 6bb75265ffb..faa3ed1746c 100644 --- a/app/views/projects/repositories/_feed.html.haml +++ b/app/views/projects/repositories/_feed.html.haml @@ -11,7 +11,7 @@ %div = link_to project_commits_path(@project, commit.id) do %code= commit.short_id - = image_tag gravatar_icon(commit.author_email), class: "", width: 16 + = image_tag gravatar_icon(commit.author_email), class: "", width: 16, alt: '' = gfm escape_once(truncate(commit.title, length: 40)) %td %span.pull-right.cgray diff --git a/app/views/projects/repositories/stats.html.haml b/app/views/projects/repositories/stats.html.haml index dfdbc898912..454296e82fd 100644 --- a/app/views/projects/repositories/stats.html.haml +++ b/app/views/projects/repositories/stats.html.haml @@ -19,7 +19,7 @@ %ol.styled - @stats.authors[0...50].each do |author| %li - = image_tag gravatar_icon(author.email, 16), class: 'avatar s16' + = image_tag gravatar_icon(author.email, 16), class: 'avatar s16', alt: '' = author.name %small.light= author.email .pull-right |