Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRajat Jain <rjain@gitlab.com>2019-04-15 12:58:30 +0300
committerKushal Pandya <kushalspandya@gmail.com>2019-04-15 12:58:30 +0300
commitb5ab1d91e377787e0711effebce073af76becc56 (patch)
tree3282fbee428f5948302eb622466f5527b01c9117 /app/assets/javascripts/vue_shared/components/sidebar
parentd83eb63beef28a6229b4bf851ee34c51938e29c7 (diff)
Display scoped labels in Issue Boards
This change brings new Scoped labels to Issue board as well. With the last change, this was missed.
Diffstat (limited to 'app/assets/javascripts/vue_shared/components/sidebar')
-rw-r--r--app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value.vue5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value.vue b/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value.vue
index ddc488adbcb..4abf7c478ee 100644
--- a/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value.vue
+++ b/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value.vue
@@ -1,6 +1,7 @@
<script>
import DropdownValueScopedLabel from './dropdown_value_scoped_label.vue';
import DropdownValueRegularLabel from './dropdown_value_regular_label.vue';
+import { isScopedLabel } from '~/lib/utils/common_utils';
export default {
components: {
@@ -45,8 +46,8 @@ export default {
scopedLabelsDescription({ description = '' }) {
return `<span class="font-weight-bold scoped-label-tooltip-title">Scoped label</span><br />${description}`;
},
- showScopedLabels({ title = '' }) {
- return this.enableScopedLabels && title.indexOf('::') !== -1;
+ showScopedLabels(label) {
+ return this.enableScopedLabels && isScopedLabel(label);
},
},
};