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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
b298758b
Commit
b298758b
authored
Mar 19, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move "Import existing repository by URL" option to button.
parent
7ed6da54
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
45 additions
and
46 deletions
+45
-46
CHANGELOG
CHANGELOG
+1
-0
app/views/projects/new.html.haml
app/views/projects/new.html.haml
+44
-46
No files found.
CHANGELOG
View file @
b298758b
...
...
@@ -6,6 +6,7 @@ v 7.10.0 (unreleased)
- Add a service to support external wikis (Hannes Rosenögger)
- List new commits for newly pushed branch in activity view.
- Add changelog, license and contribution guide links to project sidebar.
- Move "Import existing repository by URL" option to button.
v 7.9.0 (unreleased)
- Add HipChat integration documentation (Stan Hu)
...
...
app/views/projects/new.html.haml
View file @
b298758b
...
...
@@ -21,28 +21,10 @@
=
f
.
select
:namespace_id
,
namespaces_options
(
params
[
:namespace_id
]
||
:current_user
),
{},
{
class:
'select2'
,
tabindex:
2
}
%hr
.js-toggle-container
.form-group
.col-sm-2
.col-sm-10
=
link_to
"#"
,
class:
'js-toggle-button'
do
%i
.fa.fa-upload
%span
Import existing repository by URL
.js-toggle-content.hide
.form-group.import-url-data
=
f
.
label
:import_url
,
class:
'control-label'
do
%span
Import existing git repo
.col-sm-10
=
f
.
text_field
:import_url
,
class:
'form-control'
,
placeholder:
'https://github.com/randx/six.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"
}
.project-import.form-group
%label
.control-label
Import projects from
.project-import.js-toggle-container
.form-group
%label
.control-label
Import project from
.col-sm-10
-
if
github_import_enabled?
=
link_to
status_import_github_path
,
class:
'btn'
do
...
...
@@ -80,6 +62,22 @@
%i
.icon-gitorious.icon-gitorious-small
Gitorious.org
=
link_to
"#"
,
class:
'btn js-toggle-button'
do
%i
.fa.fa-git
%span
Existing 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'
.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"
}
%hr
.prepend-botton-10
.form-group
...
...
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