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:
Diffstat (limited to 'app/assets/javascripts/sidebar/components/labels/labels_select_widget/embedded_labels_list.vue')
-rw-r--r--app/assets/javascripts/sidebar/components/labels/labels_select_widget/embedded_labels_list.vue4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/sidebar/components/labels/labels_select_widget/embedded_labels_list.vue b/app/assets/javascripts/sidebar/components/labels/labels_select_widget/embedded_labels_list.vue
index 9af25130424..93c3dce4308 100644
--- a/app/assets/javascripts/sidebar/components/labels/labels_select_widget/embedded_labels_list.vue
+++ b/app/assets/javascripts/sidebar/components/labels/labels_select_widget/embedded_labels_list.vue
@@ -51,7 +51,9 @@ export default {
return this.allowScopedLabels && isScopedLabel(label);
},
isLabelLocked(label) {
- return label.lockOnMerge && this.supportsLockOnMerge;
+ // These particular labels were initialized from HAML data, so the attributes are
+ // in snake case instead of camel case
+ return label.lock_on_merge && this.supportsLockOnMerge;
},
showCloseButton(label) {
return this.allowLabelRemove && !this.isLabelLocked(label);