Merge branch 'project-members-scb' into 'master'

Resolve CE/EE diffs in project members

Closes #10496

See merge request gitlab-org/gitlab-ee!13101

app/helpers/projects_helper.rb

@@ -325,6 +325,30 @@ module ProjectsHelper
     @project.metrics_setting_external_dashboard_url
   end
 
+  def project_can_be_shared?
+    !membership_locked? || @project.allowed_to_share_with_group?
+  end
+
+  def membership_locked?
+    false
+  end
+
+  def share_project_description(project)
+    share_with_group   = project.allowed_to_share_with_group?
+    share_with_members = !membership_locked?
+
+    description =
+      if share_with_group && share_with_members
+        _("You can invite a new member to <strong>%{project_name}</strong> or invite another group.")
+      elsif share_with_group
+        _("You can invite another group to <strong>%{project_name}</strong>.")
+      elsif share_with_members
+        _("You can invite a new member to <strong>%{project_name}</strong>.")
+      end
+
+    description.html_safe % { project_name: project.name }
+  end
+
   private
 
   def get_project_nav_tabs(project, current_user)

app/views/projects/project_members/index.html.haml

@@ -7,7 +7,7 @@
       %h4
         = _("Project members")
       - if can_admin_project_members
-        %p= share_project_description
+        %p= share_project_description(@project)
       - else
         %p
           = _("Members can be added by project <i>Maintainers</i> or <i>Owners</i>").html_safe

ee/app/helpers/ee/projects_helper.rb

@@ -137,10 +137,7 @@ module EE
       ::Gitlab::RepositorySizeError.new(@project).above_size_limit_message
     end
 
-    def project_can_be_shared?
-      !membership_locked? || @project.allowed_to_share_with_group?
-    end
-
+    override :membership_locked?
     def membership_locked?
       if @project.group && @project.group.membership_lock
         true
@@ -155,24 +152,6 @@ module EE
       ::Project.in_namespace(allowed_subgroups).count
     end
 
-    def share_project_description
-      share_with_group   = @project.allowed_to_share_with_group?
-      share_with_members = !membership_locked?
-      project_name       = content_tag(:strong, @project.name)
-      member_message     = "You can invite a new member to #{project_name}"
-
-      description =
-        if share_with_group && share_with_members
-          "#{member_message} or invite another group."
-        elsif share_with_group
-          "You can invite another group to #{project_name}."
-        elsif share_with_members
-          "#{member_message}."
-        end
-
-      description.to_s.html_safe
-    end
-
     def project_security_dashboard_config(project, pipeline)
       if pipeline.nil?
         {

locale/gitlab.pot

@@ -14583,6 +14583,15 @@ msgstr ""
 msgid "You can easily install a Runner on a Kubernetes cluster. %{link_to_help_page}"
 msgstr ""
 
+msgid "You can invite a new member to <strong>%{project_name}</strong> or invite another group."
+msgstr ""
+
+msgid "You can invite a new member to <strong>%{project_name}</strong>."
+msgstr ""
+
+msgid "You can invite another group to <strong>%{project_name}</strong>."
+msgstr ""
+
 msgid "You can move around the graph by using the arrow keys."
 msgstr ""