From 97751ca19ff48b50de4887d5c77df3488c04b759 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Mon, 9 Jul 2018 10:55:10 +0300 Subject: [PATCH] Rename button at manifest import form Signed-off-by: Dmitriy Zaporozhets --- app/views/import/manifest/_form.html.haml | 2 +- .../project/import/img/manifest_upload.png | Bin 11595 -> 11940 bytes doc/user/project/import/manifest.md | 2 +- 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 index ea68e7ffc6a390a9c010b095dfe6386c036bb0c8..1925c3349ed448dbf6c4353f2c6752bc9d95fb52 100644 GIT binary patch literal 11940 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 literal 11595 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 MGRo4`QYOLw3+k8|r~m)} 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'