From e23a1e448b834482453f4e5965a8792d70ce3cd3 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Thu, 19 Mar 2015 15:43:49 +0100 Subject: [PATCH] Clear up import help. --- app/views/projects/new.html.haml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml index 46ef51d8128..173a3080b31 100644 --- a/app/views/projects/new.html.haml +++ b/app/views/projects/new.html.haml @@ -64,19 +64,22 @@ = link_to "#", class: 'btn js-toggle-button' do %i.fa.fa-git - %span Existing repo by URL + %span Any repo by URL .js-toggle-content.hide .form-group.import-url-data = f.label :import_url, class: 'control-label' do %span Git repository URL .col-sm-10 - = f.text_field :import_url, class: 'form-control', placeholder: 'https://github.com/randx/six.git' + = f.text_field :import_url, class: 'form-control', placeholder: 'https://username:password@gitlab.company.com/group/project.git' .alert.alert-info.prepend-top-10 - This URL must be publicly accessible or you can add a username and password like this: https://username:password@gitlab.com/company/project.git. - %br - The import will time out after 4 minutes. For big repositories, use a clone/push combination. - For SVN repositories, check #{link_to "this migrating from SVN doc.", "http://doc.gitlab.com/ce/workflow/migrating_from_svn.html"} + %ul + %li + The repository must be accessible over HTTP(S). If it is not publicly accessible, you can add authentication information to the URL: https://username:password@gitlab.company.com/group/project.git. + %li + The import will time out after 4 minutes. For big repositories, use a clone/push combination. + %li + To migrate an SVN repository, check out #{link_to "this document", "http://doc.gitlab.com/ce/workflow/migrating_from_svn.html"}. %hr.prepend-botton-10 -- GitLab