Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42

3 files changed, 9 insertions, 1 deletions

diff --git a/app/serializers/group_link/group_group_link_entity.rb b/app/serializers/group_link/group_group_link_entity.rb
index 563a75ccdaa..d5d7eea74ea 100644
--- a/app/serializers/group_link/group_group_link_entity.rb
+++ b/app/serializers/group_link/group_group_link_entity.rb
@@ -10,6 +10,10 @@ module GroupLink
 
     private
 
+    def can_admin_group_link?(group_link, options)
+      can?(current_user, admin_permission_name, group_link.shared_from)
+    end
+
     def admin_permission_name
       :admin_group_member
     end
diff --git a/app/serializers/group_link/group_link_entity.rb b/app/serializers/group_link/group_link_entity.rb
index 73c9931fc70..4cc7e9f3c8c 100644
--- a/app/serializers/group_link/group_link_entity.rb
+++ b/app/serializers/group_link/group_link_entity.rb
@@ -36,7 +36,7 @@ module GroupLink
     end
 
     expose :can_remove do |group_link, options|
-      can_admin_shared_from?(group_link, options)
+      direct_member?(group_link, options) && can_admin_group_link?(group_link, options)
     end
 
     expose :is_direct_member do |group_link, options|
diff --git a/app/serializers/group_link/project_group_link_entity.rb b/app/serializers/group_link/project_group_link_entity.rb
index c667bcd5bf4..d246bff1c58 100644
--- a/app/serializers/group_link/project_group_link_entity.rb
+++ b/app/serializers/group_link/project_group_link_entity.rb
@@ -10,6 +10,10 @@ module GroupLink
 
     private
 
+    def can_admin_group_link?(group_link, options)
+      can?(current_user, :admin_project_group_link, group_link)
+    end
+
     def admin_permission_name
       :admin_project_member
     end