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
7c022ae7
Commit
7c022ae7
authored
Apr 26, 2017
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[skip ci] use camelCase for avatarUrl property name
parent
27f4f2ef
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
4 deletions
+9
-4
app/assets/javascripts/sidebar/components/assignees/assignees.js
...ets/javascripts/sidebar/components/assignees/assignees.js
+3
-3
app/assets/javascripts/sidebar/stores/sidebar_store.js
app/assets/javascripts/sidebar/stores/sidebar_store.js
+6
-1
No files found.
app/assets/javascripts/sidebar/components/assignees/assignees.js
View file @
7c022ae7
...
@@ -118,7 +118,7 @@ export default {
...
@@ -118,7 +118,7 @@ export default {
width="24"
width="24"
class="avatar avatar-inline s24"
class="avatar avatar-inline s24"
:alt="assigneeAlt(user)"
:alt="assigneeAlt(user)"
:src="user.avatar
_u
rl"
:src="user.avatar
U
rl"
/>
/>
<span class="author">
<span class="author">
{{ user.name }}
{{ user.name }}
...
@@ -158,7 +158,7 @@ export default {
...
@@ -158,7 +158,7 @@ export default {
width="32"
width="32"
class="avatar avatar-inline s32"
class="avatar avatar-inline s32"
:alt="assigneeAlt(firstUser)"
:alt="assigneeAlt(firstUser)"
:src="firstUser.avatar
_u
rl"
:src="firstUser.avatar
U
rl"
/>
/>
<span class="author">
<span class="author">
{{ firstUser.name }}
{{ firstUser.name }}
...
@@ -185,7 +185,7 @@ export default {
...
@@ -185,7 +185,7 @@ export default {
width="32"
width="32"
class="avatar avatar-inline s32"
class="avatar avatar-inline s32"
:alt="assigneeAlt(user)"
:alt="assigneeAlt(user)"
:src="user.avatar
_u
rl"
:src="user.avatar
U
rl"
/>
/>
</a>
</a>
</div>
</div>
...
...
app/assets/javascripts/sidebar/stores/sidebar_store.js
View file @
7c022ae7
...
@@ -20,7 +20,12 @@ export default class SidebarStore {
...
@@ -20,7 +20,12 @@ export default class SidebarStore {
processUserData
(
data
)
{
processUserData
(
data
)
{
if
(
data
.
assignees
)
{
if
(
data
.
assignees
)
{
this
.
renderedUsers
=
data
.
assignees
;
this
.
renderedUsers
=
data
.
assignees
.
map
(
a
=>
{
a
.
avatarUrl
=
a
.
avatar_url
;
delete
a
.
avatar_url
;
return
a
;
});
this
.
removeAllUserIds
();
this
.
removeAllUserIds
();
this
.
renderedUsers
.
map
(
u
=>
this
.
addUserId
(
u
.
id
));
this
.
renderedUsers
.
map
(
u
=>
this
.
addUserId
(
u
.
id
));
...
...
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