summaryrefslogtreecommitdiff
path: root/app/views/import
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2018-07-06 13:59:48 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2018-07-11 12:22:57 +0300
commit4cee5d2e8c78001a1affc53175833641253adbb0 (patch)
treee351e35619fa167487cb1ffd6313519aca7781d7 /app/views/import
parent0f9dacf4316072ed11e9bd6f328585c469b1ad9c (diff)
downloadgitlab-ce-4cee5d2e8c78001a1affc53175833641253adbb0.tar.gz
Move manifest import to separate page and add feature specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views/import')
-rw-r--r--app/views/import/manifest/_form.html.haml2
-rw-r--r--app/views/import/manifest/status.html.haml3
2 files changed, 1 insertions, 4 deletions
diff --git a/app/views/import/manifest/_form.html.haml b/app/views/import/manifest/_form.html.haml
index 6261a2b6864..8ace2b7bff1 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 'Import projects', class: 'btn btn-success'
+ = submit_tag 'Continue to the next step', class: 'btn btn-success'
= link_to 'Cancel', new_project_path, class: 'btn btn-cancel'
diff --git a/app/views/import/manifest/status.html.haml b/app/views/import/manifest/status.html.haml
index 39aba9234d3..653dc249182 100644
--- a/app/views/import/manifest/status.html.haml
+++ b/app/views/import/manifest/status.html.haml
@@ -5,9 +5,6 @@
%h3.page-title
= _('Manifest file import')
-%p.light
- = _('Import multiple repositories by uploading a manifest file.')
-
%p
= button_tag class: "btn btn-import btn-success js-import-all" do
= import_all_githubish_repositories_button_label