diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2018-02-21 05:23:49 +0300 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2018-03-05 22:26:34 +0300 |
| commit | 32d121343d91eea44d1de344b398d30014180da0 (patch) | |
| tree | e2a873db36cf497e23ce29fb7136ad96dd868293 /app/views/projects/imports | |
| parent | 8ae57909a1ac5f398098f9d1c4581b3cf3d61674 (diff) | |
CI/CD-only projects FE
See https://gitlab.com/gitlab-org/gitlab-ee/issues/3839
Conflicts:
app/assets/javascripts/projects/project_new.js
app/views/shared/_import_form.html.haml
ee/app/controllers/ee/projects_controller.rb
ee/spec/features/projects/new_project_spec.rb
locale/gitlab.pot
Diffstat (limited to 'app/views/projects/imports')
| -rw-r--r-- | app/views/projects/imports/show.html.haml | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/app/views/projects/imports/show.html.haml b/app/views/projects/imports/show.html.haml index 8c490773a56..3b0c828ccd1 100644 --- a/app/views/projects/imports/show.html.haml +++ b/app/views/projects/imports/show.html.haml @@ -1,12 +1,11 @@ -- page_title @project.forked? ? "Forking in progress" : "Import in progress" +- page_title import_in_progress_title + .save-project-loader .center %h2 %i.fa.fa-spinner.fa-spin - - if @project.forked? - Forking in progress. - - else - Import in progress. - - if @project.external_import? + = import_in_progress_title + - if !has_ci_cd_only_params? && @project.external_import? %p.monospace git clone --bare #{@project.safe_import_url} - %p Please wait while we import the repository for you. Refresh at will. + %p + = import_wait_and_refresh_message |