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

Removes EE diffs for dropdown_value_collapsed.vue

Closes gitlab-ee#10083

See merge request gitlab-org/gitlab-ce!27367

app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed.vue

@@ -14,10 +14,12 @@ export default {
   },
   computed: {
     labelsList() {
-      const labelsString = this.labels
+      const labelsString = this.labels.length
+        ? this.labels
             .slice(0, 5)
             .map(label => label.title)
-        .join(', ');
+            .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

+---
+title: Moved EE/CE differences for dropdown_value_collapsed into CE
+merge_request: 27367
+author:
+type: other

locale/gitlab.pot

@@ -5189,6 +5189,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

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