Fix namespaces_helper reporting multiple groups

1 files changed, 5 insertions, 2 deletions

diff --git a/app/helpers/namespaces_helper.rb b/app/helpers/namespaces_helper.rb
index 9008db1b300..19aa630007d 100644
--- a/app/helpers/namespaces_helper.rb
+++ b/app/helpers/namespaces_helper.rb
@@ -14,8 +14,11 @@ module NamespacesHelper
       extra_group = Group.find(extra_group) if Namespace.find(extra_group).kind == 'group'
     end
 
-    if extra_group && extra_group.is_a?(Group) && (!Group.exists?(name: extra_group.name) || Ability.allowed?(current_user, :read_group, extra_group))
-      groups |= [extra_group]
+    if extra_group && extra_group.is_a?(Group)
+      # Avoid duplicate groups if one already exists by that name
+      existing_group = Group.find_by(name: extra_group.name)
+      extra_group = existing_group if existing_group
+      groups |= [extra_group] if Ability.allowed?(current_user, :read_group, extra_group)
     end
 
     options = []