Add latest changes from gitlab-org/gitlab@15-9-stable-eev15.9.0-rc42

1 files changed, 2 insertions, 0 deletions

diff --git a/lib/feature.rb b/lib/feature.rb
index d012639d489..17c26796ea1 100644
--- a/lib/feature.rb
+++ b/lib/feature.rb
@@ -206,6 +206,7 @@ module Feature
     # to register Flipper groups.
     # See https://docs.gitlab.com/ee/development/feature_flags/index.html
     def register_feature_groups
+      Flipper.register(:gitlab_team_members) { |actor| FeatureGroups::GitlabTeamMembers.enabled?(actor.thing) }
     end
 
     def register_definitions
@@ -423,4 +424,5 @@ module Feature
   end
 end
 
+Feature.prepend_mod
 Feature::ActiveSupportCacheStoreAdapter.prepend_mod_with('Feature::ActiveSupportCacheStoreAdapter')