Add latest changes from gitlab-org/gitlab@16-1-stable-eev16.1.0-rc42

7 files changed, 24 insertions, 14 deletions

diff --git a/app/assets/javascripts/jira_connect/subscriptions/components/add_namespace_button.vue b/app/assets/javascripts/jira_connect/subscriptions/components/add_namespace_button.vue
index 0b286bc903f..58b15b3eed1 100644
--- a/app/assets/javascripts/jira_connect/subscriptions/components/add_namespace_button.vue
+++ b/app/assets/javascripts/jira_connect/subscriptions/components/add_namespace_button.vue
@@ -14,10 +14,11 @@ export default {
   ADD_NAMESPACE_MODAL_ID,
 };
 </script>
+
 <template>
   <div>
     <gl-button v-gl-modal="$options.ADD_NAMESPACE_MODAL_ID" category="primary" variant="info">
-      {{ s__('Integrations|Add namespace') }}
+      {{ s__('JiraConnect|Link groups') }}
     </gl-button>
     <add-namespace-modal />
   </div>
diff --git a/app/assets/javascripts/jira_connect/subscriptions/components/add_namespace_modal/add_namespace_modal.vue b/app/assets/javascripts/jira_connect/subscriptions/components/add_namespace_modal/add_namespace_modal.vue
index 0e209a09b16..b2700c660b1 100644
--- a/app/assets/javascripts/jira_connect/subscriptions/components/add_namespace_modal/add_namespace_modal.vue
+++ b/app/assets/javascripts/jira_connect/subscriptions/components/add_namespace_modal/add_namespace_modal.vue
@@ -8,13 +8,14 @@ export default {
   components: { GlModal, GroupsList },
   modal: {
     id: ADD_NAMESPACE_MODAL_ID,
-    title: s__('Integrations|Link namespaces'),
+    title: s__('JiraConnect|Link groups'),
     cancelProps: {
       text: __('Cancel'),
     },
   },
 };
 </script>
+
 <template>
   <gl-modal
     :modal-id="$options.modal.id"
diff --git a/app/assets/javascripts/jira_connect/subscriptions/components/add_namespace_modal/groups_list.vue b/app/assets/javascripts/jira_connect/subscriptions/components/add_namespace_modal/groups_list.vue
index a4b728335c5..3d02dcb1198 100644
--- a/app/assets/javascripts/jira_connect/subscriptions/components/add_namespace_modal/groups_list.vue
+++ b/app/assets/javascripts/jira_connect/subscriptions/components/add_namespace_modal/groups_list.vue
@@ -65,7 +65,7 @@ export default {
           this.groups = response.data;
         })
         .catch(() => {
-          this.errorMessage = s__('Integrations|Failed to load namespaces. Please try again.');
+          this.errorMessage = s__('JiraConnect|Failed to load groups. Please try again.');
         })
         .finally(() => {
           this.isLoadingMore = false;
@@ -102,20 +102,25 @@ export default {
     </gl-alert>
 
     <gl-search-box-by-type
-      class="gl-mb-5"
+      class="gl-mb-3"
       debounce="500"
-      :placeholder="__('Search by name')"
+      :placeholder="__('Search groups')"
       :is-loading="isLoadingMore"
       :value="userSearchTerm"
       @input="onGroupSearch"
     />
 
+    <p class="gl-mb-3">
+      {{
+        s__(
+          'JiraConnect|Not seeing your groups? Only groups you have at least the Maintainer role for appear here.',
+        )
+      }}
+    </p>
+
     <gl-loading-icon v-if="isLoadingInitial" size="lg" />
     <div v-else-if="groups.length === 0" class="gl-text-center">
-      <h5>{{ s__('Integrations|No available namespaces.') }}</h5>
-      <p class="gl-mt-5">
-        {{ s__('Integrations|You must have owner or maintainer permissions to link namespaces.') }}
-      </p>
+      <h5 class="gl-mt-5">{{ s__('JiraConnect|No groups found.') }}</h5>
     </div>
     <ul
       v-else
diff --git a/app/assets/javascripts/jira_connect/subscriptions/components/browser_support_alert.vue b/app/assets/javascripts/jira_connect/subscriptions/components/browser_support_alert.vue
index ea7db5be0c4..d627e8cdd3a 100644
--- a/app/assets/javascripts/jira_connect/subscriptions/components/browser_support_alert.vue
+++ b/app/assets/javascripts/jira_connect/subscriptions/components/browser_support_alert.vue
@@ -11,14 +11,15 @@ export default {
     GlLink,
   },
   i18n: {
-    title: s__('Integrations|Your browser is not supported'),
+    title: s__('JiraConnect|Your browser is not supported'),
     body: s__(
-      'Integrations|You must use a %{linkStart}supported browser%{linkEnd} to use the GitLab for Jira app.',
+      'JiraConnect|You must use a %{linkStart}supported browser%{linkEnd} to use the GitLab for Jira app.',
     ),
   },
   DOCS_LINK_URL: helpPagePath('install/requirements', { anchor: 'supported-web-browsers' }),
 };
 </script>
+
 <template>
   <gl-alert variant="danger" :title="$options.i18n.title" :dismissible="false">
     <gl-sprintf :message="$options.i18n.body">
diff --git a/app/assets/javascripts/jira_connect/subscriptions/components/sign_in_oauth_button.vue b/app/assets/javascripts/jira_connect/subscriptions/components/sign_in_oauth_button.vue
index bc8cdf35701..45a39fa5fab 100644
--- a/app/assets/javascripts/jira_connect/subscriptions/components/sign_in_oauth_button.vue
+++ b/app/assets/javascripts/jira_connect/subscriptions/components/sign_in_oauth_button.vue
@@ -183,6 +183,7 @@ export default {
   },
 };
 </script>
+
 <template>
   <gl-button
     v-bind="$attrs"
diff --git a/app/assets/javascripts/jira_connect/subscriptions/components/subscriptions_list.vue b/app/assets/javascripts/jira_connect/subscriptions/components/subscriptions_list.vue
index 4c039be9ba5..a765040a6e7 100644
--- a/app/assets/javascripts/jira_connect/subscriptions/components/subscriptions_list.vue
+++ b/app/assets/javascripts/jira_connect/subscriptions/components/subscriptions_list.vue
@@ -24,11 +24,11 @@ export default {
   fields: [
     {
       key: 'name',
-      label: s__('Integrations|Linked namespaces'),
+      label: s__('JiraConnect|Linked groups'),
     },
     {
       key: 'created_at',
-      label: __('Added'),
+      label: __('Created on'),
       tdClass: 'gl-vertical-align-middle! gl-w-20p',
     },
     {
@@ -38,7 +38,7 @@ export default {
     },
   ],
   i18n: {
-    unlinkError: s__('Integrations|Failed to unlink namespace. Please try again.'),
+    unlinkError: s__('JiraConnect|Failed to unlink group. Please try again.'),
   },
   computed: {
     ...mapState(['subscriptions']),
diff --git a/app/assets/javascripts/jira_connect/subscriptions/components/user_link.vue b/app/assets/javascripts/jira_connect/subscriptions/components/user_link.vue
index cc0af0b9ab7..1e2c157b58d 100644
--- a/app/assets/javascripts/jira_connect/subscriptions/components/user_link.vue
+++ b/app/assets/javascripts/jira_connect/subscriptions/components/user_link.vue
@@ -41,6 +41,7 @@ export default {
   },
 };
 </script>
+
 <template>
   <div class="gl-font-base">
     <gl-sprintf :message="signedInText">