Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42

2 files changed, 29 insertions, 2 deletions

diff --git a/app/helpers/projects/alert_management_helper.rb b/app/helpers/projects/alert_management_helper.rb
index 997551d9659..58f1abb2818 100644
--- a/app/helpers/projects/alert_management_helper.rb
+++ b/app/helpers/projects/alert_management_helper.rb
@@ -34,5 +34,3 @@ module Projects::AlertManagementHelper
     )
   end
 end
-
-Projects::AlertManagementHelper.prepend_if_ee('EE::Projects::AlertManagementHelper')
diff --git a/app/helpers/projects/project_members_helper.rb b/app/helpers/projects/project_members_helper.rb
new file mode 100644
index 00000000000..168526d2abb
--- /dev/null
+++ b/app/helpers/projects/project_members_helper.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Projects::ProjectMembersHelper
+  def can_manage_project_members?(project)
+    can?(current_user, :admin_project_member, project)
+  end
+
+  def show_groups?(group_links)
+    group_links.exists? || groups_tab_active?
+  end
+
+  def show_invited_members?(project, invited_members)
+    can_manage_project_members?(project) && invited_members.exists?
+  end
+
+  def show_access_requests?(project, requesters)
+    can_manage_project_members?(project) && requesters.exists?
+  end
+
+  def groups_tab_active?
+    params[:search_groups].present?
+  end
+
+  def current_user_is_group_owner?(project)
+    return false if project.group.nil?
+
+    project.group.has_owner?(current_user)
+  end
+end