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
cb1b4af0
Commit
cb1b4af0
authored
Aug 07, 2017
by
Tim Zallmann
Committed by
Clement Ho
Aug 07, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "User dropdown in filtered search does not load avatar on `master`"
parent
475f41ac
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
3 deletions
+7
-3
app/assets/stylesheets/framework/avatar.scss
app/assets/stylesheets/framework/avatar.scss
+2
-0
app/helpers/avatars_helper.rb
app/helpers/avatars_helper.rb
+2
-1
app/views/shared/issuable/_user_dropdown_item.html.haml
app/views/shared/issuable/_user_dropdown_item.html.haml
+2
-1
spec/features/merge_requests/form_spec.rb
spec/features/merge_requests/form_spec.rb
+1
-1
No files found.
app/assets/stylesheets/framework/avatar.scss
View file @
cb1b4af0
...
@@ -100,6 +100,8 @@
...
@@ -100,6 +100,8 @@
margin
:
0
;
margin
:
0
;
align-self
:
center
;
align-self
:
center
;
}
}
&
.s40
{
min-width
:
40px
;
min-height
:
40px
;
}
}
}
.avatar-counter
{
.avatar-counter
{
...
...
app/helpers/avatars_helper.rb
View file @
cb1b4af0
...
@@ -19,7 +19,8 @@ module AvatarsHelper
...
@@ -19,7 +19,8 @@ module AvatarsHelper
class:
%W[avatar has-tooltip s
#{
avatar_size
}
]
.
push
(
*
options
[
:css_class
]),
class:
%W[avatar has-tooltip s
#{
avatar_size
}
]
.
push
(
*
options
[
:css_class
]),
alt:
"
#{
user_name
}
's avatar"
,
alt:
"
#{
user_name
}
's avatar"
,
title:
user_name
,
title:
user_name
,
data:
data_attributes
data:
data_attributes
,
lazy:
true
)
)
end
end
...
...
app/views/shared/issuable/_user_dropdown_item.html.haml
View file @
cb1b4af0
...
@@ -3,7 +3,8 @@
...
@@ -3,7 +3,8 @@
%li
.filter-dropdown-item
{
class:
(
'js-current-user'
if
user
==
current_user
)
}
%li
.filter-dropdown-item
{
class:
(
'js-current-user'
if
user
==
current_user
)
}
%button
.btn.btn-link.dropdown-user
{
type: :button
}
%button
.btn.btn-link.dropdown-user
{
type: :button
}
=
user_avatar_without_link
(
user:
user
,
lazy:
avatar
[
:lazy
],
url:
avatar
[
:url
],
size:
30
)
.avatar-container.s40
=
user_avatar_without_link
(
user:
user
,
lazy:
avatar
[
:lazy
],
url:
avatar
[
:url
],
size:
40
).
gsub
(
'/images/{{avatar_url}}'
,
'{{avatar_url}}'
).
html_safe
.dropdown-user-details
.dropdown-user-details
%span
%span
=
user
.
name
=
user
.
name
...
...
spec/features/merge_requests/form_spec.rb
View file @
cb1b4af0
...
@@ -41,7 +41,7 @@ describe 'New/edit merge request', :js do
...
@@ -41,7 +41,7 @@ describe 'New/edit merge request', :js do
expect
(
page
).
to
have_content
user2
.
name
expect
(
page
).
to
have_content
user2
.
name
end
end
click_link
'Assign to me'
find
(
'a'
,
text:
'Assign to me'
).
trigger
(
'click'
)
expect
(
find
(
'input[name="merge_request[assignee_id]"]'
,
visible:
false
).
value
).
to
match
(
user
.
id
.
to_s
)
expect
(
find
(
'input[name="merge_request[assignee_id]"]'
,
visible:
false
).
value
).
to
match
(
user
.
id
.
to_s
)
page
.
within
'.js-assignee-search'
do
page
.
within
'.js-assignee-search'
do
expect
(
page
).
to
have_content
user
.
name
expect
(
page
).
to
have_content
user
.
name
...
...
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