Merge branch 'fix-jira-users-doc' into 'master'

Fix Jira users mapping documentation

See merge request gitlab-org/gitlab!37947

app/assets/javascripts/jira_import/components/jira_import_form.vue

@@ -189,11 +189,10 @@ export default {
       <p>
         {{
           __(
-            `Jira users have been matched with similar GitLab users.
-            This can be overwritten by selecting a GitLab user from the dropdown in the "GitLab
+            `Jira users have been imported from the configured Jira instance.
+            They can be mapped by selecting a GitLab user from the dropdown in the "GitLab
             username" column.
-            If it wasn't possible to match a Jira user with a GitLab user, the dropdown defaults to
-            the user conducting the import.`,
+            When the form appears, the dropdown defaults to the user conducting the import.`,
           )
         }}
       </p>

doc/user/project/import/jira.md

@@ -77,10 +77,9 @@ Importing large projects may take several minutes depending on the size of the i
 
    In the **Jira-GitLab user mapping template** section, the table shows to which GitLab users your Jira
    users will be mapped.
-   If it wasn't possible to match a Jira user with a GitLab user, the dropdown defaults to the user
-   conducting the import.
+   When the form appears, the dropdown defaults to the user conducting the import.
 
-1. To change any of the suggested mappings, click the dropdown in the **GitLab username** column and
+1. To change any of the mappings, click the dropdown in the **GitLab username** column and
    select the user you want to map to each Jira user.
 
    The dropdown may not show all the users, so use the search bar to find a specific

locale/gitlab.pot

@@ -13333,7 +13333,7 @@ msgstr ""
 msgid "Jira service not configured."
 msgstr ""
 
-msgid "Jira users have been matched with similar GitLab users. This can be overwritten by selecting a GitLab user from the dropdown in the \"GitLab username\" column. If it wasn't possible to match a Jira user with a GitLab user, the dropdown defaults to the user conducting the import."
+msgid "Jira users have been imported from the configured Jira instance. They can be mapped by selecting a GitLab user from the dropdown in the \"GitLab username\" column. When the form appears, the dropdown defaults to the user conducting the import."
 msgstr ""
 
 msgid "Jira-GitLab user mapping template"

spec/frontend/jira_import/components/jira_import_form_spec.js

@@ -103,7 +103,7 @@ describe('JiraImportForm', () => {
 
     it('shows information to the user', () => {
       expect(wrapper.find('p').text()).toBe(
-        'Jira users have been matched with similar GitLab users. This can be overwritten by selecting a GitLab user from the dropdown in the "GitLab username" column. If it wasn\'t possible to match a Jira user with a GitLab user, the dropdown defaults to the user conducting the import.',
+        'Jira users have been imported from the configured Jira instance. They can be mapped by selecting a GitLab user from the dropdown in the "GitLab username" column. When the form appears, the dropdown defaults to the user conducting the import.',
       );
     });
   });