Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
329a5555
Commit
329a5555
authored
Nov 12, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix-avatar-not-showing' of
https://gitlab.com/stanhu/gitlab-ce
parents
63144cd0
97380977
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
4 deletions
+5
-4
CHANGELOG
CHANGELOG
+1
-0
app/helpers/events_helper.rb
app/helpers/events_helper.rb
+1
-1
app/helpers/issues_helper.rb
app/helpers/issues_helper.rb
+1
-1
app/views/projects/commits/show.atom.builder
app/views/projects/commits/show.atom.builder
+1
-1
app/views/projects/notes/_note.html.haml
app/views/projects/notes/_note.html.haml
+1
-1
No files found.
CHANGELOG
View file @
329a5555
...
@@ -3,6 +3,7 @@ Please view this file on the master branch, on stable branches it's out of date.
...
@@ -3,6 +3,7 @@ Please view this file on the master branch, on stable branches it's out of date.
v 8.2.0 (unreleased)
v 8.2.0 (unreleased)
- Remove CSS property preventing hard tabs from rendering in Chromium 45 (Stan Hu)
- Remove CSS property preventing hard tabs from rendering in Chromium 45 (Stan Hu)
- Fix Drone CI service template not saving properly (Stan Hu)
- Fix Drone CI service template not saving properly (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)
- 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)
- 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
- Improved performance of finding users by one of their Email addresses
...
...
app/helpers/events_helper.rb
View file @
329a5555
...
@@ -198,7 +198,7 @@ module EventsHelper
...
@@ -198,7 +198,7 @@ module EventsHelper
xml
.
link
href:
event_link
xml
.
link
href:
event_link
xml
.
title
truncate
(
event_title
,
length:
80
)
xml
.
title
truncate
(
event_title
,
length:
80
)
xml
.
updated
event
.
created_at
.
xmlschema
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
.
author
do
|
author
|
xml
.
name
event
.
author_name
xml
.
name
event
.
author_name
xml
.
email
event
.
author_email
xml
.
email
event
.
author_email
...
...
app/helpers/issues_helper.rb
View file @
329a5555
...
@@ -74,7 +74,7 @@ module IssuesHelper
...
@@ -74,7 +74,7 @@ module IssuesHelper
issue
.
project
,
issue
)
issue
.
project
,
issue
)
xml
.
title
truncate
(
issue
.
title
,
length:
80
)
xml
.
title
truncate
(
issue
.
title
,
length:
80
)
xml
.
updated
issue
.
created_at
.
strftime
(
"%Y-%m-%dT%H:%M:%SZ"
)
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
.
author
do
|
author
|
xml
.
name
issue
.
author_name
xml
.
name
issue
.
author_name
xml
.
email
issue
.
author_email
xml
.
email
issue
.
author_email
...
...
app/views/projects/commits/show.atom.builder
View file @
329a5555
...
@@ -12,7 +12,7 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://sear
...
@@ -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.link href: namespace_project_commit_url(@project.namespace, @project, id: commit.id)
xml.title truncate(commit.title, length: 80)
xml.title truncate(commit.title, length: 80)
xml.updated commit.committed_date.strftime("%Y-%m-%dT%H:%M:%SZ")
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.author do |author|
xml.name commit.author_name
xml.name commit.author_name
xml.email commit.author_email
xml.email commit.author_email
...
...
app/views/projects/notes/_note.html.haml
View file @
329a5555
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
.timeline-entry-inner
.timeline-entry-inner
.timeline-icon
.timeline-icon
%a
{
href:
user_path
(
note
.
author
)}
%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
.timeline-content
.note-header
.note-header
-
if
note_editable?
(
note
)
-
if
note_editable?
(
note
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment