diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-29 03:09:37 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-29 03:09:37 +0300 |
| commit | 937f82e11fe1d3970ea3e1f281185e91d8f5102e (patch) | |
| tree | 9c69e19144f2f9d7d5119496f468aea4f1538137 /app/assets/javascripts/jira_import | |
| parent | 583fadea8d738850cbd83dcde1118d3fc3462d61 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/jira_import')
| -rw-r--r-- | app/assets/javascripts/jira_import/components/jira_import_form.vue | 7 |
1 files changed, 3 insertions, 4 deletions
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 24bfb49a7d1..eb72e8581e8 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.`, + When the form appears, the dropdown defaults to the user conducting the import.`, ) }} </p> |