Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42

1 files changed, 1 insertions, 2 deletions

diff --git a/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/store/mutations.js b/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/store/mutations.js
index 43b23994cdf..c85d9befcbb 100644
--- a/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/store/mutations.js
+++ b/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/store/mutations.js
@@ -94,14 +94,13 @@ export default {
       candidateLabel.indeterminate = false;
     }
 
-    if (isScopedLabel(candidateLabel)) {
+    if (isScopedLabel(candidateLabel) && !state.allowMultipleScopedLabels) {
       const currentActiveScopedLabel = state.labels.find(
         ({ set, title }) =>
           set &&
           title !== candidateLabel.title &&
           scopedLabelKey({ title }) === scopedLabelKey(candidateLabel),
       );
-
       if (currentActiveScopedLabel) {
         currentActiveScopedLabel.set = false;
       }