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
ee7d2298
Commit
ee7d2298
authored
Apr 15, 2019
by
Denys Mishunov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removes EE diffs for dropdown_value_collapsed
parent
d83eb63b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
6 deletions
+16
-6
app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed.vue
...onents/sidebar/labels_select/dropdown_value_collapsed.vue
+6
-4
changelogs/unreleased/10083-dropdown-ce-ee-difference.yml
changelogs/unreleased/10083-dropdown-ce-ee-difference.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+3
-0
spec/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed_spec.js
...ts/sidebar/labels_select/dropdown_value_collapsed_spec.js
+2
-2
No files found.
app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed.vue
View file @
ee7d2298
...
...
@@ -14,10 +14,12 @@ export default {
},
computed
:
{
labelsList
()
{
const
labelsString
=
this
.
labels
.
slice
(
0
,
5
)
.
map
(
label
=>
label
.
title
)
.
join
(
'
,
'
);
const
labelsString
=
this
.
labels
.
length
?
this
.
labels
.
slice
(
0
,
5
)
.
map
(
label
=>
label
.
title
)
.
join
(
'
,
'
)
:
s__
(
'
LabelSelect|Labels
'
);
if
(
this
.
labels
.
length
>
5
)
{
return
sprintf
(
s__
(
'
LabelSelect|%{labelsString}, and %{remainingLabelCount} more
'
),
{
...
...
changelogs/unreleased/10083-dropdown-ce-ee-difference.yml
0 → 100644
View file @
ee7d2298
---
title
:
Moved EE/CE differences for dropdown_value_collapsed into CE
merge_request
:
27367
author
:
type
:
other
locale/gitlab.pot
View file @
ee7d2298
...
...
@@ -5069,6 +5069,9 @@ msgstr ""
msgid "LabelSelect|%{labelsString}, and %{remainingLabelCount} more"
msgstr ""
msgid "LabelSelect|Labels"
msgstr ""
msgid "Labels"
msgstr ""
...
...
spec/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed_spec.js
View file @
ee7d2298
...
...
@@ -27,10 +27,10 @@ describe('DropdownValueCollapsedComponent', () => {
describe
(
'
computed
'
,
()
=>
{
describe
(
'
labelsList
'
,
()
=>
{
it
(
'
returns
empty
text when `labels` prop is empty array
'
,
()
=>
{
it
(
'
returns
default
text when `labels` prop is empty array
'
,
()
=>
{
const
vmEmptyLabels
=
createComponent
([]);
expect
(
vmEmptyLabels
.
labelsList
).
toBe
(
''
);
expect
(
vmEmptyLabels
.
labelsList
).
toBe
(
'
Labels
'
);
vmEmptyLabels
.
$destroy
();
});
...
...
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