Add latest changes from gitlab-org/gitlab@master

3 files changed, 8 insertions, 16 deletions

diff --git a/app/assets/javascripts/invite_members/components/user_limit_notification.vue b/app/assets/javascripts/invite_members/components/user_limit_notification.vue
index ae5c3c11386..6c9b1f8e6d0 100644
--- a/app/assets/javascripts/invite_members/components/user_limit_notification.vue
+++ b/app/assets/javascripts/invite_members/components/user_limit_notification.vue
@@ -10,7 +10,6 @@ import {
   CLOSE_TO_LIMIT_MESSAGE,
   CLOSE_TO_LIMIT_MESSAGE_PERSONAL_NAMESPACE,
   DANGER_ALERT_TITLE_PERSONAL_NAMESPACE,
-  WARNING_ALERT_TITLE_PERSONAL_NAMESPACE,
 } from '../constants';
 
 export default {
@@ -46,13 +45,6 @@ export default {
       return this.usersLimitDataset.purchasePath;
     },
     warningAlertTitle() {
-      if (this.usersLimitDataset.userNamespace) {
-        return sprintf(WARNING_ALERT_TITLE_PERSONAL_NAMESPACE, {
-          count: this.freeUsersLimit - this.membersCount,
-          members: this.pluralMembers(this.freeUsersLimit - this.membersCount),
-        });
-      }
-
       return sprintf(WARNING_ALERT_TITLE, {
         count: this.freeUsersLimit - this.membersCount,
         members: this.pluralMembers(this.freeUsersLimit - this.membersCount),
diff --git a/app/assets/javascripts/invite_members/constants.js b/app/assets/javascripts/invite_members/constants.js
index f5187a3ef0c..6a0be3fc75b 100644
--- a/app/assets/javascripts/invite_members/constants.js
+++ b/app/assets/javascripts/invite_members/constants.js
@@ -138,9 +138,6 @@ export const ON_SUBMIT_TRACK_LABEL = 'manage_members_clicked';
 export const WARNING_ALERT_TITLE = s__(
   'InviteMembersModal|You only have space for %{count} more %{members} in %{name}',
 );
-export const WARNING_ALERT_TITLE_PERSONAL_NAMESPACE = s__(
-  'InviteMembersModal|You only have space for %{count} more %{members} in your personal projects',
-);
 export const DANGER_ALERT_TITLE = s__(
   "InviteMembersModal|You've reached your %{count} %{members} limit for %{name}",
 );
@@ -155,12 +152,12 @@ export const REACHED_LIMIT_MESSAGE = s__(
 
 export const REACHED_LIMIT_UPGRADE_SUGGESTION_MESSAGE = REACHED_LIMIT_MESSAGE.concat(
   s__(
-    'InviteMembersModal| To get more members and access to additional paid features, an owner of this namespace can start a trial or upgrade to a paid tier.',
+    'InviteMembersModal| To get more members and access to additional paid features, an owner of the group can start a trial or upgrade to a paid tier.',
   ),
 );
 
 export const CLOSE_TO_LIMIT_MESSAGE = s__(
-  'InviteMembersModal|To get more members an owner of this namespace can %{trialLinkStart}start a trial%{trialLinkEnd} or %{upgradeLinkStart}upgrade%{upgradeLinkEnd} to a paid tier.',
+  'InviteMembersModal|To get more members an owner of the group can %{trialLinkStart}start a trial%{trialLinkEnd} or %{upgradeLinkStart}upgrade%{upgradeLinkEnd} to a paid tier.',
 );
 export const CLOSE_TO_LIMIT_MESSAGE_PERSONAL_NAMESPACE = s__(
   'InviteMembersModal|To make more space, you can remove members who no longer need access.',
diff --git a/app/assets/javascripts/invite_members/init_invite_members_modal.js b/app/assets/javascripts/invite_members/init_invite_members_modal.js
index a4be3f205a3..6e2c0ecb5bb 100644
--- a/app/assets/javascripts/invite_members/init_invite_members_modal.js
+++ b/app/assets/javascripts/invite_members/init_invite_members_modal.js
@@ -20,6 +20,8 @@ export default (function initInviteMembersModal() {
         return false;
       }
 
+      const usersLimitDataset = JSON.parse(el.dataset.usersLimitDataset || '{}');
+
       inviteMembersModal = new Vue({
         el,
         name: 'InviteMembersModalRoot',
@@ -38,9 +40,10 @@ export default (function initInviteMembersModal() {
               projects: JSON.parse(el.dataset.projects || '[]'),
               usersFilter: el.dataset.usersFilter,
               filterId: parseInt(el.dataset.filterId, 10),
-              usersLimitDataset: convertObjectPropsToCamelCase(
-                JSON.parse(el.dataset.usersLimitDataset || '{}'),
-              ),
+              usersLimitDataset: convertObjectPropsToCamelCase({
+                ...usersLimitDataset,
+                user_namespace: parseBoolean(usersLimitDataset.user_namespace),
+              }),
             },
           }),
       });