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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
a5e271b6
Commit
a5e271b6
authored
6 years ago
by
Andreas Brandl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use more specific #avatar_icon_for_email.
parent
be231d21
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
app/views/help/ui.html.haml
app/views/help/ui.html.haml
+1
-1
app/views/projects/network/show.json.erb
app/views/projects/network/show.json.erb
+1
-1
app/views/shared/members/_member.html.haml
app/views/shared/members/_member.html.haml
+1
-1
No files found.
app/views/help/ui.html.haml
View file @
a5e271b6
...
@@ -68,7 +68,7 @@
...
@@ -68,7 +68,7 @@
.example
.example
.cover-block
.cover-block
.avatar-holder
.avatar-holder
=
image_tag
avatar_icon
(
'admin@example.com'
,
90
),
class:
"avatar s90"
,
alt:
''
=
image_tag
avatar_icon
_for_email
(
'admin@example.com'
,
90
),
class:
"avatar s90"
,
alt:
''
.cover-title
.cover-title
John Smith
John Smith
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/network/show.json.erb
View file @
a5e271b6
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
author:
{
author:
{
name:
c
.
author_name
,
name:
c
.
author_name
,
email:
c
.
author_email
,
email:
c
.
author_email
,
icon:
image_path
(
avatar_icon
(
c
.
author_email
,
20
))
icon:
image_path
(
avatar_icon
_for_email
(
c
.
author_email
,
20
))
},
},
time:
c
.
time
,
time:
c
.
time
,
space:
c
.
spaces
.
first
,
space:
c
.
spaces
.
first
,
...
...
This diff is collapsed.
Click to expand it.
app/views/shared/members/_member.html.haml
View file @
a5e271b6
...
@@ -36,7 +36,7 @@
...
@@ -36,7 +36,7 @@
Expires in
#{
distance_of_time_in_words_to_now
(
member
.
expires_at
)
}
Expires in
#{
distance_of_time_in_words_to_now
(
member
.
expires_at
)
}
-
else
-
else
=
image_tag
avatar_icon
(
member
.
invite_email
,
40
),
class:
"avatar s40"
,
alt:
''
=
image_tag
avatar_icon
_for_email
(
member
.
invite_email
,
40
),
class:
"avatar s40"
,
alt:
''
.user-info
.user-info
.member
=
member
.
invite_email
.member
=
member
.
invite_email
.cgray
.cgray
...
...
This diff is collapsed.
Click to expand it.
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