Fix avatars not showing in Atom feeds and project issues when Gravatar disabled
Fix for https://github.com/gitlabhq/gitlabhq/pull/9783
This commit is contained in:
parent
f162ed7aeb
commit
9738097722
5 changed files with 5 additions and 4 deletions
|
@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date.
|
|||
|
||||
v 8.2.0 (unreleased)
|
||||
- Remove CSS property preventing hard tabs from rendering in Chromium 45 (Stan Hu)
|
||||
- Fix avatars not showing in Atom feeds and project issues when Gravatar disabled (Stan Hu)
|
||||
- Added a GitLab specific profiling tool called "Sherlock" (see GitLab CE merge request #1749)
|
||||
- Upgrade gitlab_git to 7.2.20 and rugged to 0.23.3 (Stan Hu)
|
||||
- Improved performance of finding users by one of their Email addresses
|
||||
|
|
|
@ -198,7 +198,7 @@ module EventsHelper
|
|||
xml.link href: event_link
|
||||
xml.title truncate(event_title, length: 80)
|
||||
xml.updated event.created_at.xmlschema
|
||||
xml.media :thumbnail, width: "40", height: "40", url: avatar_icon(event.author_email)
|
||||
xml.media :thumbnail, width: "40", height: "40", url: image_url(avatar_icon(event.author_email))
|
||||
xml.author do |author|
|
||||
xml.name event.author_name
|
||||
xml.email event.author_email
|
||||
|
|
|
@ -74,7 +74,7 @@ module IssuesHelper
|
|||
issue.project, issue)
|
||||
xml.title truncate(issue.title, length: 80)
|
||||
xml.updated issue.created_at.strftime("%Y-%m-%dT%H:%M:%SZ")
|
||||
xml.media :thumbnail, width: "40", height: "40", url: avatar_icon(issue.author_email)
|
||||
xml.media :thumbnail, width: "40", height: "40", url: image_url(avatar_icon(issue.author_email))
|
||||
xml.author do |author|
|
||||
xml.name issue.author_name
|
||||
xml.email issue.author_email
|
||||
|
|
|
@ -12,7 +12,7 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://sear
|
|||
xml.link href: namespace_project_commit_url(@project.namespace, @project, id: commit.id)
|
||||
xml.title truncate(commit.title, length: 80)
|
||||
xml.updated commit.committed_date.strftime("%Y-%m-%dT%H:%M:%SZ")
|
||||
xml.media :thumbnail, width: "40", height: "40", url: avatar_icon(commit.author_email)
|
||||
xml.media :thumbnail, width: "40", height: "40", url: image_url(avatar_icon(commit.author_email))
|
||||
xml.author do |author|
|
||||
xml.name commit.author_name
|
||||
xml.email commit.author_email
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
.timeline-entry-inner
|
||||
.timeline-icon
|
||||
%a{href: user_path(note.author)}
|
||||
%img.avatar.s40{src: avatar_icon(note.author), alt: ''}
|
||||
= image_tag avatar_icon(note.author), alt: '', class: 'avatar s40'
|
||||
.timeline-content
|
||||
.note-header
|
||||
- if note_editable?(note)
|
||||
|
|
Loading…
Reference in a new issue