diff options
| author | Marin Jankovski <maxlazio@gmail.com> | 2014-10-15 13:13:42 +0200 |
|---|---|---|
| committer | Marin Jankovski <maxlazio@gmail.com> | 2014-10-15 13:13:42 +0200 |
| commit | 76cde5c0e534e59c7dcd8bc7e096cfb0bf9f2603 (patch) | |
| tree | bfc3bcee4aae543baeff7bbe3f2abebd49e5b311 | |
| parent | 2803d9e0257c08107db5cebb9a5b10b87d6ca358 (diff) | |
| download | gitlab-ce-76cde5c0e534e59c7dcd8bc7e096cfb0bf9f2603.tar.gz | |
Add links to the migration doc, make it clear import is only for git repos.
| -rw-r--r-- | app/views/projects/import.html.haml | 3 | ||||
| -rw-r--r-- | app/views/projects/new.html.haml | 3 | ||||
| -rw-r--r-- | doc/workflow/README.md | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/app/views/projects/import.html.haml b/app/views/projects/import.html.haml index 1f7fd26c646..4513c89e784 100644 --- a/app/views/projects/import.html.haml +++ b/app/views/projects/import.html.haml @@ -19,12 +19,13 @@ = form_for @project, url: retry_import_project_path(@project), method: :put, html: { class: 'form-horizontal' } do |f| .form-group.import-url-data = f.label :import_url, class: 'control-label' do - %span Import existing repo + %span Import existing git repo .col-sm-10 = f.text_field :import_url, class: 'form-control', placeholder: 'https://github.com/randx/six.git' .bs-callout.bs-callout-info 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"} .form-actions = f.submit 'Retry import', class: "btn btn-create", tabindex: 4 diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml index 6c986050c45..f5cd0f21e01 100644 --- a/app/views/projects/new.html.haml +++ b/app/views/projects/new.html.haml @@ -44,13 +44,14 @@ .js-toggle-content.hide .form-group.import-url-data = f.label :import_url, class: 'control-label' do - %span Import existing repo + %span Import existing git repo .col-sm-10 = f.text_field :import_url, class: 'form-control', placeholder: 'https://github.com/randx/six.git' .bs-callout.bs-callout-info 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"} %hr .form-group diff --git a/doc/workflow/README.md b/doc/workflow/README.md index 323ee48f3bc..c9768a98033 100644 --- a/doc/workflow/README.md +++ b/doc/workflow/README.md @@ -4,3 +4,4 @@ - [Groups](groups.md) - [Labels](labels.md) - [GitLab Flow](gitlab_flow.md) +- [Migrating from SVN to GitLab](migrating_from_svn.md) |