diff options
| author | Andreas Brandl <abrandl@gitlab.com> | 2018-02-09 12:36:35 +0100 |
|---|---|---|
| committer | Andreas Brandl <abrandl@gitlab.com> | 2018-02-13 18:04:51 +0100 |
| commit | d5ffcb81b6f9d0750fac75d1655dc8d77c07bc85 (patch) | |
| tree | dffb8af6b11f23d939eafaee9e2c51bfdba7622b | |
| parent | 2e6dea7aab9daa2c876b7a77f51821b0fca07b7f (diff) | |
| download | gitlab-ce-d5ffcb81b6f9d0750fac75d1655dc8d77c07bc85.tar.gz | |
Use avatar_icon_for_email for commits.
We need to keep the email lookup as we want to fall back to displaying
the gravatar result for a given email if the user does not exist.
| -rw-r--r-- | app/views/projects/commits/_commit.atom.builder | 2 | ||||
| -rw-r--r-- | app/views/projects/repositories/_feed.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/commits/_commit.atom.builder b/app/views/projects/commits/_commit.atom.builder index 04914888763..50f7e7a3a33 100644 --- a/app/views/projects/commits/_commit.atom.builder +++ b/app/views/projects/commits/_commit.atom.builder @@ -3,7 +3,7 @@ xml.entry do xml.link href: project_commit_url(@project, id: commit.id) xml.title truncate(commit.title, length: 80, escape: false) xml.updated commit.committed_date.xmlschema - xml.media :thumbnail, width: "40", height: "40", url: image_url(avatar_icon(commit.author_email)) + xml.media :thumbnail, width: "40", height: "40", url: image_url(avatar_icon_for_email(commit.author_email)) xml.author do |author| xml.name commit.author_name diff --git a/app/views/projects/repositories/_feed.html.haml b/app/views/projects/repositories/_feed.html.haml index 170f9e259df..87895a15239 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 avatar_icon(commit.author_email), class: "", width: 16, alt: '' + = image_tag avatar_icon_for_email(commit.author_email), class: "", width: 16, alt: '' = markdown(truncate(commit.title, length: 40), pipeline: :single_line, author: commit.author) %td %span.pull-right.cgray |