diff options
| author | Denys Mishunov <dmishunov@gitlab.com> | 2019-04-15 11:22:27 +0200 |
|---|---|---|
| committer | Denys Mishunov <dmishunov@gitlab.com> | 2019-04-15 11:54:35 +0200 |
| commit | ee7d2298e5560539815df6c7b982bc3182aea198 (patch) | |
| tree | 63643c4c41979d0965d08e2b9b68cfa54626de90 | |
| parent | d83eb63beef28a6229b4bf851ee34c51938e29c7 (diff) | |
| download | gitlab-ce-10083-dropdown-ce-ee-difference.tar.gz | |
Removes EE diffs for dropdown_value_collapsed10083-dropdown-ce-ee-difference
4 files changed, 16 insertions, 6 deletions
diff --git a/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed.vue b/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed.vue index 373794fb1f2..05446903286 100644 --- a/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed.vue +++ b/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 - .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'), { diff --git a/changelogs/unreleased/10083-dropdown-ce-ee-difference.yml b/changelogs/unreleased/10083-dropdown-ce-ee-difference.yml new file mode 100644 index 00000000000..e8594edb76a --- /dev/null +++ b/changelogs/unreleased/10083-dropdown-ce-ee-difference.yml @@ -0,0 +1,5 @@ +--- +title: Moved EE/CE differences for dropdown_value_collapsed into CE +merge_request: 27367 +author: +type: other diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 4f401acccf9..1ccd5443588 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -5069,6 +5069,9 @@ msgstr "" msgid "LabelSelect|%{labelsString}, and %{remainingLabelCount} more" msgstr "" +msgid "LabelSelect|Labels" +msgstr "" + msgid "Labels" msgstr "" diff --git a/spec/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed_spec.js b/spec/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed_spec.js index cb49fa31d20..4d3de5e474d 100644 --- a/spec/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed_spec.js +++ b/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(); }); |