Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42

1 files changed, 7 insertions, 0 deletions

diff --git a/app/assets/javascripts/feature_flags/components/form.vue b/app/assets/javascripts/feature_flags/components/form.vue
index 29e82289107..26da0d56f9a 100644
--- a/app/assets/javascripts/feature_flags/components/form.vue
+++ b/app/assets/javascripts/feature_flags/components/form.vue
@@ -142,7 +142,14 @@ export default {
       return !this.$options.rolloutPercentageRegex.test(percentage);
     }),
     onFormStrategyChange(strategy, index) {
+      const currentUserListId = this.filteredStrategies[index]?.userList?.id;
+      const newUserListId = strategy?.userList?.id;
+
       Object.assign(this.filteredStrategies[index], strategy);
+
+      if (currentUserListId !== newUserListId) {
+        this.formStrategies = [...this.formStrategies];
+      }
     },
   },
 };