diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2019-04-17 09:02:17 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2019-04-17 09:02:17 +0000 |
commit | 9ba30fc55d82a24ac5e07459a39e937fa3966d86 (patch) | |
tree | 4dfd25bc7d0b7f7bc6de8b82e29804516917e6c9 | |
parent | 4d78cacc83df59318867f021e4b168453ef49fc3 (diff) | |
parent | ee7d2298e5560539815df6c7b982bc3182aea198 (diff) | |
download | gitlab-ce-9ba30fc55d82a24ac5e07459a39e937fa3966d86.tar.gz |
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
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 e50f76f2397..da09f305400 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -5189,6 +5189,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(); }); |