Add latest changes from gitlab-org/gitlab@master

2 files changed, 36 insertions, 17 deletions

diff --git a/app/assets/javascripts/invite_members/components/invite_members_modal.vue b/app/assets/javascripts/invite_members/components/invite_members_modal.vue
index 2ab49b6c760..47f1405c980 100644
--- a/app/assets/javascripts/invite_members/components/invite_members_modal.vue
+++ b/app/assets/javascripts/invite_members/components/invite_members_modal.vue
@@ -76,7 +76,7 @@ export default {
       const inviteTo = this.isProject ? 'toProject' : 'toGroup';
 
       return sprintf(this.$options.labels[this.inviteeType][inviteTo].introText, {
-        name: this.name.toUpperCase(),
+        name: this.name,
       });
     },
     toastOptions() {
@@ -215,10 +215,14 @@ export default {
       searchField: s__('InviteMembersModal|GitLab member or Email address'),
       placeHolder: s__('InviteMembersModal|Search for members to invite'),
       toGroup: {
-        introText: s__("InviteMembersModal|You're inviting members to the %{name} group"),
+        introText: s__(
+          "InviteMembersModal|You're inviting members to the %{strongStart}%{name}%{strongEnd} group.",
+        ),
       },
       toProject: {
-        introText: s__("InviteMembersModal|You're inviting members to the %{name} project"),
+        introText: s__(
+          "InviteMembersModal|You're inviting members to the %{strongStart}%{name}%{strongEnd} project.",
+        ),
       },
     },
     group: {
@@ -226,10 +230,14 @@ export default {
       searchField: s__('InviteMembersModal|Select a group to invite'),
       placeHolder: s__('InviteMembersModal|Search for a group to invite'),
       toGroup: {
-        introText: s__("InviteMembersModal|You're inviting a group to the %{name} group"),
+        introText: s__(
+          "InviteMembersModal|You're inviting a group to the %{strongStart}%{name}%{strongEnd} group.",
+        ),
       },
       toProject: {
-        introText: s__("InviteMembersModal|You're inviting a group to the %{name} project"),
+        introText: s__(
+          "InviteMembersModal|You're inviting a group to the %{strongStart}%{name}%{strongEnd} project.",
+        ),
       },
     },
     accessLevel: s__('InviteMembersModal|Choose a role permission'),
@@ -253,7 +261,13 @@ export default {
     :header-close-label="$options.labels.headerCloseLabel"
   >
     <div>
-      <p ref="introText">{{ introText }}</p>
+      <p ref="introText">
+        <gl-sprintf :message="introText">
+          <template #strong="{ content }">
+            <strong>{{ content }}</strong>
+          </template>
+        </gl-sprintf>
+      </p>
 
       <label :id="$options.membersTokenSelectLabelId" class="gl-font-weight-bold gl-mt-5">{{
         $options.labels[inviteeType].searchField
diff --git a/app/assets/javascripts/invite_members/components/invite_members_trigger.vue b/app/assets/javascripts/invite_members/components/invite_members_trigger.vue
index f8cc74511d9..666693e934f 100644
--- a/app/assets/javascripts/invite_members/components/invite_members_trigger.vue
+++ b/app/assets/javascripts/invite_members/components/invite_members_trigger.vue
@@ -1,13 +1,10 @@
 <script>
-import { GlLink, GlIcon } from '@gitlab/ui';
+import { GlButton } from '@gitlab/ui';
 import { s__ } from '~/locale';
 import eventHub from '../event_hub';
 
 export default {
-  components: {
-    GlLink,
-    GlIcon,
-  },
+  components: { GlButton },
   props: {
     displayText: {
       type: String,
@@ -24,6 +21,11 @@ export default {
       required: false,
       default: '',
     },
+    variant: {
+      type: String,
+      required: false,
+      default: undefined,
+    },
   },
   methods: {
     openModal() {
@@ -34,10 +36,13 @@ export default {
 </script>
 
 <template>
-  <gl-link :class="classes" data-qa-selector="invite_members_button" @click="openModal">
-    <div v-if="icon" class="nav-icon-container">
-      <gl-icon :size="16" :name="icon" />
-    </div>
-    <span class="nav-item-name"> {{ displayText }} </span>
-  </gl-link>
+  <gl-button
+    :class="classes"
+    :icon="icon"
+    :variant="variant"
+    data-qa-selector="invite_members_button"
+    @click="openModal"
+  >
+    {{ displayText }}
+  </gl-button>
 </template>