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
9f5019c7
Commit
9f5019c7
authored
Sep 18, 2019
by
Walmyr Lima
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update views for testability
And prettify one of them due to static analysis violation.
parent
8132d4b2
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
4 deletions
+11
-4
app/assets/javascripts/sidebar/components/assignees/assignee_avatar.vue
...ascripts/sidebar/components/assignees/assignee_avatar.vue
+1
-0
app/assets/javascripts/sidebar/components/assignees/assignee_title.vue
...vascripts/sidebar/components/assignees/assignee_title.vue
+2
-1
app/assets/javascripts/sidebar/components/assignees/uncollapsed_assignee_list.vue
...idebar/components/assignees/uncollapsed_assignee_list.vue
+6
-1
app/helpers/projects_helper.rb
app/helpers/projects_helper.rb
+1
-1
app/views/shared/issuable/_assignees.html.haml
app/views/shared/issuable/_assignees.html.haml
+1
-1
No files found.
app/assets/javascripts/sidebar/components/assignees/assignee_avatar.vue
View file @
9f5019c7
...
...
@@ -42,6 +42,7 @@ export default {
:width=
"imgSize"
:class=
"`s$
{imgSize}`"
class="avatar avatar-inline m-0"
data-qa-selector="avatar_image"
/>
<i
v-if=
"hasMergeIcon"
aria-hidden=
"true"
class=
"fa fa-exclamation-triangle merge-icon"
></i>
</span>
...
...
app/assets/javascripts/sidebar/components/assignees/assignee_title.vue
View file @
9f5019c7
...
...
@@ -32,13 +32,14 @@ export default {
};
</
script
>
<
template
>
<div
class=
"title hide-collapsed"
>
<div
class=
"title hide-collapsed"
data-qa-selector=
"assignee_title"
>
{{
assigneeTitle
}}
<i
v-if=
"loading"
aria-hidden=
"true"
class=
"fa fa-spinner fa-spin block-loading"
></i>
<a
v-if=
"editable"
class=
"js-sidebar-dropdown-toggle edit-link float-right"
href=
"#"
data-qa-selector=
"assignee_edit_link"
data-track-event=
"click_edit_button"
data-track-label=
"right_sidebar"
data-track-property=
"assignee"
...
...
app/assets/javascripts/sidebar/components/assignees/uncollapsed_assignee_list.vue
View file @
9f5019c7
...
...
@@ -85,7 +85,12 @@ export default {
</div>
</div>
<div
v-if=
"renderShowMoreSection"
class=
"user-list-more"
>
<button
type=
"button"
class=
"btn-link"
@
click=
"toggleShowLess"
>
<button
type=
"button"
class=
"btn-link"
data-qa-selector=
"more_assignees_link"
@
click=
"toggleShowLess"
>
<template
v-if=
"showLess"
>
{{
hiddenAssigneesLabel
}}
</
template
>
...
...
app/helpers/projects_helper.rb
View file @
9f5019c7
...
...
@@ -76,7 +76,7 @@ module ProjectsHelper
link_to
(
author_html
,
user_path
(
author
),
class:
"author-link js-user-link
#{
"
#{
opts
[
:extra_class
]
}
"
if
opts
[
:extra_class
]
}
#{
"
#{
opts
[
:mobile_classes
]
}
"
if
opts
[
:mobile_classes
]
}
"
,
data:
data_attrs
).
html_safe
else
title
=
opts
[
:title
].
sub
(
":name"
,
sanitize
(
author
.
name
))
link_to
(
author_html
,
user_path
(
author
),
class:
"author-link has-tooltip"
,
title:
title
,
data:
{
container:
'body'
}).
html_safe
link_to
(
author_html
,
user_path
(
author
),
class:
"author-link has-tooltip"
,
title:
title
,
data:
{
container:
'body'
,
qa_selector:
'assignee_link'
}).
html_safe
end
end
...
...
app/views/shared/issuable/_assignees.html.haml
View file @
9f5019c7
...
...
@@ -7,4 +7,4 @@
=
link_to_member
(
@project
,
assignee
,
name:
false
,
title:
"Assigned to :name"
)
-
if
more_assignees_count
.
positive?
%span
{
class:
'avatar-counter has-tooltip'
,
data:
{
container:
'body'
,
placement:
'bottom'
,
'line-type'
=>
'old'
,
'original-title'
=>
"+#{more_assignees_count} more assignees"
}
}
+
#{
more_assignees_count
}
%span
{
class:
'avatar-counter has-tooltip'
,
data:
{
container:
'body'
,
placement:
'bottom'
,
'line-type'
=>
'old'
,
'original-title'
=>
"+#{more_assignees_count} more assignees"
,
qa_selector:
'avatar_counter'
}
}
+
#{
more_assignees_count
}
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