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
d0779d61
Commit
d0779d61
authored
Jun 26, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4239 from karlhungus/feature-alt-text-for-gravatars
Gravatar image fixes when gravatar unavailable
parents
579c0b97
d1da45e1
Changes
18
Show whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
18 additions
and
19 deletions
+18
-19
app/assets/stylesheets/gitlab_bootstrap/avatar.scss
app/assets/stylesheets/gitlab_bootstrap/avatar.scss
+1
-0
app/helpers/projects_helper.rb
app/helpers/projects_helper.rb
+1
-1
app/views/admin/users/show.html.haml
app/views/admin/users/show.html.haml
+1
-2
app/views/events/_commit.html.haml
app/views/events/_commit.html.haml
+1
-1
app/views/events/_event.html.haml
app/views/events/_event.html.haml
+1
-1
app/views/groups/people.html.haml
app/views/groups/people.html.haml
+1
-1
app/views/issues/_issues.html.haml
app/views/issues/_issues.html.haml
+1
-1
app/views/layouts/_head_panel.html.haml
app/views/layouts/_head_panel.html.haml
+1
-2
app/views/notes/_discussion.html.haml
app/views/notes/_discussion.html.haml
+1
-1
app/views/notes/_note.html.haml
app/views/notes/_note.html.haml
+1
-1
app/views/profiles/show.html.haml
app/views/profiles/show.html.haml
+1
-1
app/views/repositories/_branch.html.haml
app/views/repositories/_branch.html.haml
+1
-1
app/views/repositories/_feed.html.haml
app/views/repositories/_feed.html.haml
+1
-1
app/views/repositories/stats.html.haml
app/views/repositories/stats.html.haml
+1
-1
app/views/snippets/_snippet.html.haml
app/views/snippets/_snippet.html.haml
+1
-1
app/views/team_members/_team_member.html.haml
app/views/team_members/_team_member.html.haml
+1
-1
app/views/teams/members/_member.html.haml
app/views/teams/members/_member.html.haml
+1
-1
app/views/users/show.html.haml
app/views/users/show.html.haml
+1
-1
No files found.
app/assets/stylesheets/gitlab_bootstrap/avatar.scss
View file @
d0779d61
...
...
@@ -15,6 +15,7 @@
&
.s16
{
width
:
16px
;
height
:
16px
;
margin-right
:
6px
;
}
&
.s24
{
width
:
24px
;
height
:
24px
;
margin-right
:
8px
;
}
&
.s26
{
width
:
26px
;
height
:
26px
;
margin-right
:
8px
;
}
&
.s32
{
width
:
32px
;
height
:
32px
;
margin-right
:
10px
;
}
&
.s90
{
width
:
90px
;
height
:
90px
;
margin-right
:
15px
;
}
}
...
...
app/helpers/projects_helper.rb
View file @
d0779d61
...
...
@@ -25,7 +25,7 @@ module ProjectsHelper
author_html
=
""
# Build avatar image tag
author_html
<<
image_tag
(
gravatar_icon
(
author
.
try
(
:email
),
opts
[
:size
]),
width:
opts
[
:size
],
class:
"avatar avatar-inline
#{
"s
#{
opts
[
:size
]
}
"
if
opts
[
:size
]
}
"
)
if
opts
[
:avatar
]
author_html
<<
image_tag
(
gravatar_icon
(
author
.
try
(
:email
),
opts
[
:size
]),
width:
opts
[
:size
],
class:
"avatar avatar-inline
#{
"s
#{
opts
[
:size
]
}
"
if
opts
[
:size
]
}
"
,
alt
:''
)
if
opts
[
:avatar
]
# Build name span tag
author_html
<<
content_tag
(
:span
,
sanitize
(
author
.
name
),
class:
'author'
)
if
opts
[
:name
]
...
...
app/views/admin/users/show.html.haml
View file @
d0779d61
...
...
@@ -24,7 +24,7 @@
%h5
.title
Account:
.pull-right
=
image_tag
gravatar_icon
(
@admin_user
.
email
,
32
),
class:
"avatar s32
"
=
image_tag
gravatar_icon
(
@admin_user
.
email
,
32
),
class
:
"avatar s32"
,
alt
:"
"
%ul
.well-list
%li
%span
.light
Name:
...
...
@@ -62,7 +62,6 @@
%span
.light
Created by:
%strong
=
link_to
@admin_user
.
created_by
.
name
,
[
:admin
,
@admin_user
.
created_by
]
%hr
%h5
Add User to Projects
...
...
app/views/events/_commit.html.haml
View file @
d0779d61
%li
.commit
%p
=
link_to
commit
[
:id
][
0
..
8
],
project_commit_path
(
project
,
commit
[
:id
]),
class:
"commit_short_id"
=
link_to
commit
[
:id
][
0
..
8
],
project_commit_path
(
project
,
commit
[
:id
]),
class:
"commit_short_id"
,
alt:
''
%span
=
commit
[
:author
][
:name
]
–
=
image_tag
gravatar_icon
(
commit
[
:author
][
:email
]),
class:
"avatar"
,
width:
16
...
...
app/views/events/_event.html.haml
View file @
d0779d61
...
...
@@ -4,7 +4,7 @@
#{
time_ago_in_words
(
event
.
created_at
)
}
ago.
=
cache
event
do
=
image_tag
gravatar_icon
(
event
.
author_email
),
class:
"avatar s24"
=
image_tag
gravatar_icon
(
event
.
author_email
),
class:
"avatar s24"
,
alt
:''
-
if
event
.
push?
=
render
"events/event/push"
,
event:
event
...
...
app/views/groups/people.html.haml
View file @
d0779d61
...
...
@@ -12,7 +12,7 @@
%ul
.well-list
-
@users
.
each
do
|
user
|
%li
=
image_tag
gravatar_icon
(
user
.
email
,
16
),
class:
"avatar s16"
=
image_tag
gravatar_icon
(
user
.
email
,
16
),
class:
"avatar s16"
,
alt:
''
%strong
=
user
.
name
%span
.cgray
=
user
.
email
-
if
@group
.
owner
==
user
...
...
app/views/issues/_issues.html.haml
View file @
d0779d61
...
...
@@ -53,7 +53,7 @@
-
@project
.
users
.
sort_by
(
&
:name
).
each
do
|
user
|
%li
=
link_to
project_issues_with_filter_path
(
@project
,
assignee_id:
user
.
id
)
do
=
image_tag
gravatar_icon
(
user
.
email
),
class:
"avatar s16"
=
image_tag
gravatar_icon
(
user
.
email
),
class:
"avatar s16"
,
alt:
''
=
user
.
name
.dropdown.inline.prepend-left-10
...
...
app/views/layouts/_head_panel.html.haml
View file @
d0779d61
...
...
@@ -37,5 +37,4 @@
%i
.icon-signout
%li
=
link_to
current_user
,
class:
"profile-pic"
do
=
image_tag
gravatar_icon
(
current_user
.
email
,
26
)
=
image_tag
(
gravatar_icon
(
current_user
.
email
,
26
),
alt:
''
,
class:
"avatar s26"
)
app/views/notes/_discussion.html.haml
View file @
d0779d61
...
...
@@ -8,7 +8,7 @@
=
link_to
"javascript:;"
,
class:
"js-details-target turn-off js-toggler-target"
do
%i
.icon-eye-open
Show discussion
=
image_tag
gravatar_icon
(
note
.
author
.
email
),
class:
"avatar s32"
=
image_tag
gravatar_icon
(
note
.
author
.
email
),
class:
"avatar s32"
,
alt:
''
%div
=
link_to_member
(
@project
,
note
.
author
,
avatar:
false
)
-
if
note
.
for_merge_request?
...
...
app/views/notes/_note.html.haml
View file @
d0779d61
...
...
@@ -8,7 +8,7 @@
-
if
(
note
.
author_id
==
current_user
.
id
)
||
can?
(
current_user
,
:admin_note
,
@project
)
=
link_to
project_note_path
(
@project
,
note
),
title:
"Remove comment"
,
method: :delete
,
confirm:
'Are you sure you want to remove comment?'
,
remote:
true
,
class:
"danger js-note-delete"
do
%i
.icon-trash.cred
=
image_tag
gravatar_icon
(
note
.
author
.
email
),
class:
"avatar s32"
=
image_tag
gravatar_icon
(
note
.
author
.
email
),
class:
"avatar s32"
,
alt:
''
=
link_to_member
(
@project
,
note
.
author
,
avatar:
false
)
%span
.note-last-update
=
time_ago_in_words
(
note
.
updated_at
)
...
...
app/views/profiles/show.html.haml
View file @
d0779d61
.profile_avatar_holder
=
image_tag
gravatar_icon
(
@user
.
email
,
90
)
=
image_tag
gravatar_icon
(
@user
.
email
,
90
)
,
alt:
''
%h3
.page_title
=
@user
.
name
%br
...
...
app/views/repositories/_branch.html.haml
View file @
d0779d61
...
...
@@ -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
...
...
app/views/repositories/_feed.html.haml
View file @
d0779d61
...
...
@@ -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
...
...
app/views/repositories/stats.html.haml
View file @
d0779d61
...
...
@@ -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
...
...
app/views/snippets/_snippet.html.haml
View file @
d0779d61
...
...
@@ -25,6 +25,6 @@
=
"#
#{
snippet
.
id
}
"
%span
.light
by
=
image_tag
gravatar_icon
(
snippet
.
author_email
),
class:
"avatar avatar-inline s16"
=
image_tag
gravatar_icon
(
snippet
.
author_email
),
class:
"avatar avatar-inline s16"
,
alt:
''
=
snippet
.
author_name
app/views/team_members/_team_member.html.haml
View file @
d0779d61
...
...
@@ -4,7 +4,7 @@
.row
.span4
=
link_to
user
,
title:
user
.
name
,
class:
"dark"
do
=
image_tag
gravatar_icon
(
user
.
email
,
32
),
class:
"avatar s32"
=
image_tag
gravatar_icon
(
user
.
email
,
32
),
class:
"avatar s32"
,
alt:
''
%strong
=
truncate
(
user
.
name
,
lenght:
40
)
%br
%small
.cgray
=
user
.
username
...
...
app/views/teams/members/_member.html.haml
View file @
d0779d61
...
...
@@ -4,7 +4,7 @@
.row
.span3
=
link_to
user_path
(
user
.
username
),
title:
user
.
name
,
class:
"dark"
do
=
image_tag
gravatar_icon
(
user
.
email
,
40
),
class:
"avatar s32"
=
image_tag
gravatar_icon
(
user
.
email
,
40
),
class:
"avatar s32"
,
alt:
''
=
link_to
user_path
(
user
.
username
),
title:
user
.
name
,
class:
"dark"
do
%strong
=
truncate
(
user
.
name
,
lenght:
40
)
%br
...
...
app/views/users/show.html.haml
View file @
d0779d61
.row
.span8
%h3
.page_title
=
image_tag
gravatar_icon
(
@user
.
email
,
90
),
class:
"avatar s90"
=
image_tag
gravatar_icon
(
@user
.
email
,
90
),
class:
"avatar s90"
,
alt:
''
=
@user
.
name
-
if
@user
==
current_user
.pull-right
...
...
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