kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '10083-dropdown-ce-ee-difference' into 'master'

Browse source 
Removes EE diffs for dropdown_value_collapsed.vue

Closes gitlab-ee#10083

See merge request gitlab-org/gitlab-ce!27367
This commit is contained in:
Filipa Lacerda 2019-04-17 09:02:17 +00:00
commit 9ba30fc55d
4 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed.vue
View file

@ -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'), {

5
changelogs/unreleased/10083-dropdown-ce-ee-difference.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Moved EE/CE differences for dropdown_value_collapsed into CE
merge_request: 27367
author:
type: other

3
locale/gitlab.pot
View file

@ -5189,6 +5189,9 @@ msgstr ""
msgid "LabelSelect|%{labelsString}, and %{remainingLabelCount} more"
msgstr ""
msgid "LabelSelect|Labels"
msgstr ""
msgid "Labels"
msgstr ""

4
spec/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed_spec.js
View file

@ -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();
});