Move "Import existing repository by URL" option to button.
This commit is contained in:
Douwe Maan
parent
7ed6da5454
commit
b298758b44
2 changed files with 45 additions and 46 deletions
|
|
@ -6,6 +6,7 @@ v 7.10.0 (unreleased)
|
||||||
- Add a service to support external wikis (Hannes Rosenögger)
|
- Add a service to support external wikis (Hannes Rosenögger)
|
||||||
- List new commits for newly pushed branch in activity view.
|
- List new commits for newly pushed branch in activity view.
|
||||||
- Add changelog, license and contribution guide links to project sidebar.
|
- Add changelog, license and contribution guide links to project sidebar.
|
||||||
|
- Move "Import existing repository by URL" option to button.
|
||||||
|
|
||||||
v 7.9.0 (unreleased)
|
v 7.9.0 (unreleased)
|
||||||
- Add HipChat integration documentation (Stan Hu)
|
- Add HipChat integration documentation (Stan Hu)
|
||||||
|
|
|
||||||
|
|
@ -21,17 +21,55 @@
|
||||||
= f.select :namespace_id, namespaces_options(params[:namespace_id] || :current_user), {}, {class: 'select2', tabindex: 2}
|
= f.select :namespace_id, namespaces_options(params[:namespace_id] || :current_user), {}, {class: 'select2', tabindex: 2}
|
||||||
|
|
||||||
%hr
|
%hr
|
||||||
.js-toggle-container
|
|
||||||
|
.project-import.js-toggle-container
|
||||||
.form-group
|
.form-group
|
||||||
.col-sm-2
|
%label.control-label Import project from
|
||||||
.col-sm-10
|
.col-sm-10
|
||||||
= link_to "#", class: 'js-toggle-button' do
|
- if github_import_enabled?
|
||||||
%i.fa.fa-upload
|
= link_to status_import_github_path, class: 'btn' do
|
||||||
%span Import existing repository by URL
|
%i.fa.fa-github
|
||||||
|
GitHub
|
||||||
|
- else
|
||||||
|
= link_to '#', class: 'how_to_import_link light btn' do
|
||||||
|
%i.fa.fa-github
|
||||||
|
GitHub
|
||||||
|
= render 'github_import_modal'
|
||||||
|
|
||||||
|
|
||||||
|
- if bitbucket_import_enabled?
|
||||||
|
= link_to status_import_bitbucket_path, class: 'btn' do
|
||||||
|
%i.fa.fa-bitbucket
|
||||||
|
Bitbucket
|
||||||
|
- else
|
||||||
|
= link_to '#', class: 'how_to_import_link light btn' do
|
||||||
|
%i.fa.fa-bitbucket
|
||||||
|
Bitbucket
|
||||||
|
= render 'bitbucket_import_modal'
|
||||||
|
|
||||||
|
- unless request.host == 'gitlab.com'
|
||||||
|
- if gitlab_import_enabled?
|
||||||
|
= link_to status_import_gitlab_path, class: 'btn' do
|
||||||
|
%i.fa.fa-heart
|
||||||
|
GitLab.com
|
||||||
|
- else
|
||||||
|
= link_to '#', class: 'how_to_import_link light btn' do
|
||||||
|
%i.fa.fa-heart
|
||||||
|
GitLab.com
|
||||||
|
= render 'gitlab_import_modal'
|
||||||
|
|
||||||
|
= link_to new_import_gitorious_path, class: 'btn' do
|
||||||
|
%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
|
.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 git repo
|
%span Git repository URL
|
||||||
.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'
|
||||||
.alert.alert-info.prepend-top-10
|
.alert.alert-info.prepend-top-10
|
||||||
|
|
@ -40,46 +78,6 @@
|
||||||
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"}
|
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
|
|
||||||
.col-sm-10
|
|
||||||
- if github_import_enabled?
|
|
||||||
= link_to status_import_github_path, class: 'btn' do
|
|
||||||
%i.fa.fa-github
|
|
||||||
GitHub
|
|
||||||
- else
|
|
||||||
= link_to '#', class: 'how_to_import_link light btn' do
|
|
||||||
%i.fa.fa-github
|
|
||||||
GitHub
|
|
||||||
= render 'github_import_modal'
|
|
||||||
|
|
||||||
|
|
||||||
- if bitbucket_import_enabled?
|
|
||||||
= link_to status_import_bitbucket_path, class: 'btn' do
|
|
||||||
%i.fa.fa-bitbucket
|
|
||||||
Bitbucket
|
|
||||||
- else
|
|
||||||
= link_to '#', class: 'how_to_import_link light btn' do
|
|
||||||
%i.fa.fa-bitbucket
|
|
||||||
Bitbucket
|
|
||||||
= render 'bitbucket_import_modal'
|
|
||||||
|
|
||||||
- unless request.host == 'gitlab.com'
|
|
||||||
- if gitlab_import_enabled?
|
|
||||||
= link_to status_import_gitlab_path, class: 'btn' do
|
|
||||||
%i.fa.fa-heart
|
|
||||||
GitLab.com
|
|
||||||
- else
|
|
||||||
= link_to '#', class: 'how_to_import_link light btn' do
|
|
||||||
%i.fa.fa-heart
|
|
||||||
GitLab.com
|
|
||||||
= render 'gitlab_import_modal'
|
|
||||||
|
|
||||||
= link_to new_import_gitorious_path, class: 'btn' do
|
|
||||||
%i.icon-gitorious.icon-gitorious-small
|
|
||||||
Gitorious.org
|
|
||||||
|
|
||||||
%hr.prepend-botton-10
|
%hr.prepend-botton-10
|
||||||
|
|
||||||
.form-group
|
.form-group
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue