Commit e5a427c5 authored by Phil Hughes's avatar Phil Hughes

Merge branch 'xanf-update-placeholder-for-bulk-imports' into 'master'

Change filter wording for group import

See merge request gitlab-org/gitlab!65732
parents eeb94aef 11a6c3ef
...@@ -227,7 +227,12 @@ export default { ...@@ -227,7 +227,12 @@ export default {
</template> </template>
</gl-sprintf> </gl-sprintf>
</span> </span>
<gl-search-box-by-click class="gl-ml-auto" @submit="filter = $event" @clear="filter = ''" /> <gl-search-box-by-click
class="gl-ml-auto"
:placeholder="s__('BulkImport|Filter by source group')"
@submit="filter = $event"
@clear="filter = ''"
/>
</div> </div>
<gl-loading-icon v-if="$apollo.loading" size="md" class="gl-mt-5" /> <gl-loading-icon v-if="$apollo.loading" size="md" class="gl-mt-5" />
<template v-else> <template v-else>
......
...@@ -110,7 +110,7 @@ on an existing group's page. ...@@ -110,7 +110,7 @@ on an existing group's page.
1. On the New Group page, select **Import group**. 1. On the New Group page, select **Import group**.
![Fill in import details](img/import_panel_v13_8.png) ![Fill in import details](img/import_panel_v14_1.png)
1. Fill in source URL of your GitLab. 1. Fill in source URL of your GitLab.
1. Fill in [personal access token](../../../user/profile/personal_access_tokens.md) for remote GitLab instance. 1. Fill in [personal access token](../../../user/profile/personal_access_tokens.md) for remote GitLab instance.
...@@ -129,4 +129,4 @@ Migration importer page. Listed are the remote GitLab groups to which you have t ...@@ -129,4 +129,4 @@ Migration importer page. Listed are the remote GitLab groups to which you have t
1. Once a group has been imported, click its GitLab path to open its GitLab URL. 1. Once a group has been imported, click its GitLab path to open its GitLab URL.
![Group Importer page](img/bulk_imports_v13_8.png) ![Group Importer page](img/bulk_imports_v14_1.png)
...@@ -93,9 +93,9 @@ on an existing group's page. ...@@ -93,9 +93,9 @@ on an existing group's page.
![Navigation paths to create a new group](img/new_group_navigation_v13_1.png) ![Navigation paths to create a new group](img/new_group_navigation_v13_1.png)
1. On the New Group page, select the **Import group** tab. 1. On the New Group page, select the **Import group**.
![Fill in group details](img/import_panel_v13_4.png) ![Fill in group details](img/import_panel_v14_1.png)
1. Enter your group name. 1. Enter your group name.
......
...@@ -5681,6 +5681,9 @@ msgstr "" ...@@ -5681,6 +5681,9 @@ msgstr ""
msgid "BulkImport|Existing groups" msgid "BulkImport|Existing groups"
msgstr "" msgstr ""
msgid "BulkImport|Filter by source group"
msgstr ""
msgid "BulkImport|From source group" msgid "BulkImport|From source group"
msgstr "" msgstr ""
......
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