diff options
| -rw-r--r-- | app/views/import/manifest/_form.html.haml | 2 | ||||
| -rw-r--r-- | doc/user/project/import/img/manifest_upload.png | bin | 11595 -> 11940 bytes | |||
| -rw-r--r-- | doc/user/project/import/manifest.md | 2 | ||||
| -rw-r--r-- | spec/features/import/manifest_import_spec.rb | 4 |
4 files changed, 4 insertions, 4 deletions
diff --git a/app/views/import/manifest/_form.html.haml b/app/views/import/manifest/_form.html.haml index 8ace2b7bff1..5fdc97537fe 100644 --- a/app/views/import/manifest/_form.html.haml +++ b/app/views/import/manifest/_form.html.haml @@ -18,5 +18,5 @@ = _('Choose the top-level group for your repository imports.') .append-bottom-10 - = submit_tag 'Continue to the next step', class: 'btn btn-success' + = submit_tag 'List available repositories', class: 'btn btn-success' = link_to 'Cancel', new_project_path, class: 'btn btn-cancel' diff --git a/doc/user/project/import/img/manifest_upload.png b/doc/user/project/import/img/manifest_upload.png Binary files differindex ea68e7ffc6a..1925c3349ed 100644 --- a/doc/user/project/import/img/manifest_upload.png +++ b/doc/user/project/import/img/manifest_upload.png diff --git a/doc/user/project/import/manifest.md b/doc/user/project/import/manifest.md index 136ba310da1..5ec64225098 100644 --- a/doc/user/project/import/manifest.md +++ b/doc/user/project/import/manifest.md @@ -10,7 +10,7 @@ You can do it by following next steps: 1. Click on the **Manifest file** button 1. Provide GitLab with a manifest xml file 1. Select a group you want to import to (you need to create a group first if you don't have one) -1. Click **Continue to the next step** +1. Click **List available repositories** 1. You will be redirected to the import status page with projects list based on manifest file 1. Check the list and click 'Import all repositories' to start import. diff --git a/spec/features/import/manifest_import_spec.rb b/spec/features/import/manifest_import_spec.rb index 98431463f65..06d0f2b1857 100644 --- a/spec/features/import/manifest_import_spec.rb +++ b/spec/features/import/manifest_import_spec.rb @@ -16,7 +16,7 @@ feature 'Import multiple repositories by uploading a manifest file', :js, :postg visit new_import_manifest_path attach_file('manifest', Rails.root.join('spec/fixtures/aosp_manifest.xml')) - click_on 'Continue to the next step' + click_on 'List available repositories' expect(page).to have_button('Import all repositories') expect(page).to have_content('https://android-review.googlesource.com/platform/build/blueprint') @@ -26,7 +26,7 @@ feature 'Import multiple repositories by uploading a manifest file', :js, :postg visit new_import_manifest_path attach_file('manifest', Rails.root.join('spec/fixtures/aosp_manifest.xml')) - click_on 'Continue to the next step' + click_on 'List available repositories' page.within(first_row) do click_on 'Import' |
