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/labels_select_root.vue')
-rw-r--r--app/assets/javascripts/sidebar/components/labels/labels_select_widget/labels_select_root.vue12
1 files changed, 6 insertions, 6 deletions
diff --git a/app/assets/javascripts/sidebar/components/labels/labels_select_widget/labels_select_root.vue b/app/assets/javascripts/sidebar/components/labels/labels_select_widget/labels_select_root.vue
index 7125ccdb8ca..e0d7400f7a6 100644
--- a/app/assets/javascripts/sidebar/components/labels/labels_select_widget/labels_select_root.vue
+++ b/app/assets/javascripts/sidebar/components/labels/labels_select_widget/labels_select_root.vue
@@ -52,11 +52,6 @@ export default {
required: false,
default: false,
},
- enforceLockedLabelsOnMerge: {
- type: Boolean,
- required: false,
- default: false,
- },
showEmbeddedLabelsList: {
type: Boolean,
required: false,
@@ -106,6 +101,11 @@ export default {
type: String,
required: true,
},
+ issuableSupportsLockOnMerge: {
+ type: Boolean,
+ required: false,
+ default: false,
+ },
workspaceType: {
type: String,
required: true,
@@ -157,7 +157,7 @@ export default {
return this.showEmbeddedLabelsList && isDropdownVariantEmbedded(this.variant);
},
isLockOnMergeSupported() {
- return this.enforceLockedLabelsOnMerge;
+ return this.issuableSupportsLockOnMerge || this.issuable?.supportsLockOnMerge;
},
},
apollo: {