Add links to the migration doc, make it clear import is only for git repos.
This commit is contained in:
parent
2803d9e025
commit
76cde5c0e5
|
@ -19,12 +19,13 @@
|
||||||
= form_for @project, url: retry_import_project_path(@project), method: :put, html: { class: 'form-horizontal' } do |f|
|
= form_for @project, url: retry_import_project_path(@project), method: :put, html: { class: 'form-horizontal' } do |f|
|
||||||
.form-group.import-url-data
|
.form-group.import-url-data
|
||||||
= f.label :import_url, class: 'control-label' do
|
= f.label :import_url, class: 'control-label' do
|
||||||
%span Import existing repo
|
%span Import existing git repo
|
||||||
.col-sm-10
|
.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://github.com/randx/six.git'
|
||||||
.bs-callout.bs-callout-info
|
.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.
|
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
|
%br
|
||||||
The import will time out after 4 minutes. For big repositories, use a clone/push combination.
|
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
|
.form-actions
|
||||||
= f.submit 'Retry import', class: "btn btn-create", tabindex: 4
|
= f.submit 'Retry import', class: "btn btn-create", tabindex: 4
|
||||||
|
|
|
@ -44,13 +44,14 @@
|
||||||
.js-toggle-content.hide
|
.js-toggle-content.hide
|
||||||
.form-group.import-url-data
|
.form-group.import-url-data
|
||||||
= f.label :import_url, class: 'control-label' do
|
= f.label :import_url, class: 'control-label' do
|
||||||
%span Import existing repo
|
%span Import existing git repo
|
||||||
.col-sm-10
|
.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://github.com/randx/six.git'
|
||||||
.bs-callout.bs-callout-info
|
.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.
|
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
|
%br
|
||||||
The import will time out after 4 minutes. For big repositories, use a clone/push combination.
|
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
|
%hr
|
||||||
|
|
||||||
.form-group
|
.form-group
|
||||||
|
|
|
@ -4,3 +4,4 @@
|
||||||
- [Groups](groups.md)
|
- [Groups](groups.md)
|
||||||
- [Labels](labels.md)
|
- [Labels](labels.md)
|
||||||
- [GitLab Flow](gitlab_flow.md)
|
- [GitLab Flow](gitlab_flow.md)
|
||||||
|
- [Migrating from SVN to GitLab](migrating_from_svn.md)
|
||||||
|
|
Loading…
Reference in New Issue