Commit 08969217 authored by Jarka Košanová's avatar Jarka Košanová

Fix Jira users mapping documentation

- fix the documentation and the help text in the Jira import form
- update the locale  files
- update the specs
parent f3caeb39
...@@ -189,11 +189,10 @@ export default { ...@@ -189,11 +189,10 @@ export default {
<p> <p>
{{ {{
__( __(
`Jira users have been matched with similar GitLab users. `Jira users have been imported from the configured Jira instance.
This can be overwritten by selecting a GitLab user from the dropdown in the "GitLab They can be mapped by selecting a GitLab user from the dropdown in the "GitLab
username" column. username" column.
If it wasn't possible to match a Jira user with a GitLab user, the dropdown defaults to In the beginning the dropdown defaults to the user conducting the import.`,
the user conducting the import.`,
) )
}} }}
</p> </p>
......
...@@ -77,10 +77,9 @@ Importing large projects may take several minutes depending on the size of the i ...@@ -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 In the **Jira-GitLab user mapping template** section, the table shows to which GitLab users your Jira
users will be mapped. users will be mapped.
If it wasn't possible to match a Jira user with a GitLab user, the dropdown defaults to the user In the beginning the dropdown defaults to the user conducting the import.
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. 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 The dropdown may not show all the users, so use the search bar to find a specific
......
...@@ -13333,7 +13333,7 @@ msgstr "" ...@@ -13333,7 +13333,7 @@ msgstr ""
msgid "Jira service not configured." msgid "Jira service not configured."
msgstr "" 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 "" msgstr ""
msgid "Jira-GitLab user mapping template" msgid "Jira-GitLab user mapping template"
......
...@@ -103,7 +103,7 @@ describe('JiraImportForm', () => { ...@@ -103,7 +103,7 @@ describe('JiraImportForm', () => {
it('shows information to the user', () => { it('shows information to the user', () => {
expect(wrapper.find('p').text()).toBe( 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.',
); );
}); });
}); });
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment