diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-20 12:40:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-20 12:40:42 +0300 |
commit | ee664acb356f8123f4f6b00b73c1e1cf0866c7fb (patch) | |
tree | f8479f94a28f66654c6a4f6fb99bad6b4e86a40e /app/finders/groups/accepting_group_transfers_finder.rb | |
parent | 62f7d5c5b69180e82ae8196b7b429eeffc8e7b4f (diff) |
Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42
Diffstat (limited to 'app/finders/groups/accepting_group_transfers_finder.rb')
-rw-r--r-- | app/finders/groups/accepting_group_transfers_finder.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/app/finders/groups/accepting_group_transfers_finder.rb b/app/finders/groups/accepting_group_transfers_finder.rb index df67f940d20..c95318d0098 100644 --- a/app/finders/groups/accepting_group_transfers_finder.rb +++ b/app/finders/groups/accepting_group_transfers_finder.rb @@ -13,12 +13,7 @@ module Groups def execute return Group.none unless can_transfer_group? - items = if Feature.enabled?(:include_groups_from_group_shares_in_group_transfer_locations) - find_all_groups - else - find_groups - end - + items = find_all_groups items = by_search(items) sort(items) |