Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kazuhiko Shiozaki
gitlab-ce
Commits
76cde5c0
Commit
76cde5c0
authored
Oct 15, 2014
by
Marin Jankovski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add links to the migration doc, make it clear import is only for git repos.
parent
2803d9e0
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
2 deletions
+5
-2
app/views/projects/import.html.haml
app/views/projects/import.html.haml
+2
-1
app/views/projects/new.html.haml
app/views/projects/new.html.haml
+2
-1
doc/workflow/README.md
doc/workflow/README.md
+1
-0
No files found.
app/views/projects/import.html.haml
View file @
76cde5c0
...
@@ -19,12 +19,13 @@
...
@@ -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
app/views/projects/new.html.haml
View file @
76cde5c0
...
@@ -44,13 +44,14 @@
...
@@ -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
...
...
doc/workflow/README.md
View file @
76cde5c0
...
@@ -4,3 +4,4 @@
...
@@ -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
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment