diff --git a/app/assets/javascripts/jira_import/components/jira_import_form.vue b/app/assets/javascripts/jira_import/components/jira_import_form.vue index 24bfb49a7d18b85ce5e7a12f5339d59bd7906f32..980fd7f0f100aa70ce3dfc6277752615b70b13e1 100644 --- a/app/assets/javascripts/jira_import/components/jira_import_form.vue +++ b/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.`, + In the beginning the dropdown defaults to the user conducting the import.`, ) }} </p> diff --git a/doc/user/project/import/jira.md b/doc/user/project/import/jira.md index 482e632baa27f88d3a2483d1d102b9cbfc7de944..0090ef913b7a50f7b0de1ef6329dfe8afa1e68f2 100644 --- a/doc/user/project/import/jira.md +++ b/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. + In the beginning 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 diff --git a/locale/gitlab.pot b/locale/gitlab.pot index fd739397a272d823bed77df9049496d343d50729..cc49ac800fb550bd8c1dbca5cd4b27599bdcb87b 100644 --- a/locale/gitlab.pot +++ b/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. In the beginning the dropdown defaults to the user conducting the import." msgstr "" msgid "Jira-GitLab user mapping template" diff --git a/spec/frontend/jira_import/components/jira_import_form_spec.js b/spec/frontend/jira_import/components/jira_import_form_spec.js index 12d161edf72a05ff6c6615b981683e9744606a9e..1b975689e05c12ec9931e089467c6cb0ddc344c5 100644 --- a/spec/frontend/jira_import/components/jira_import_form_spec.js +++ b/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. In the beginning the dropdown defaults to the user conducting the import.', ); }); });