Commit 82d4760d authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'import-button' into 'master'

Move "Import existing repository by URL" option to button.

The "Import existing repository URL" (with or without form visible) looked out place with the new import buttons. I moved it to a button, and moved the form to below the buttons.

@dzaporozhets Would be nice to have in 7.9 since the moved buttons are in there as well.

Before:

![Screen_Shot_2015-03-19_at_15.08.04](https://dev.gitlab.org/gitlab/gitlabhq/uploads/6ac26467ede65a4f31d004c227fdbc3e/Screen_Shot_2015-03-19_at_15.08.04.png)

After:

![Screen_Shot_2015-03-19_at_15.42.56](https://dev.gitlab.org/gitlab/gitlabhq/uploads/a73bd7d09b7a33f58067a3bd0d7f604a/Screen_Shot_2015-03-19_at_15.42.56.png)

("publically" typo has been fixed to "publicly")

See merge request !1728
parents 476199e0 e23a1e44
...@@ -9,6 +9,7 @@ v 7.10.0 (unreleased) ...@@ -9,6 +9,7 @@ v 7.10.0 (unreleased)
- Improve diff UI - Improve diff UI
- Fix alignment of navbar toggle button (Cody Mize) - Fix alignment of navbar toggle button (Cody Mize)
- Identical look of selectboxes in UI - Identical look of selectboxes in UI
- 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,64 +21,65 @@ ...@@ -21,64 +21,65 @@
= 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
.js-toggle-content.hide GitHub
.form-group.import-url-data - else
= f.label :import_url, class: 'control-label' do = link_to '#', class: 'how_to_import_link light btn' do
%span Import existing git repo %i.fa.fa-github
.col-sm-10 GitHub
= f.text_field :import_url, class: 'form-control', placeholder: 'https://github.com/randx/six.git' = render 'github_import_modal'
.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 - if bitbucket_import_enabled?
%label.control-label Import projects from = link_to status_import_bitbucket_path, class: 'btn' do
.col-sm-10 %i.fa.fa-bitbucket
- if github_import_enabled? Bitbucket
= 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 - else
= link_to '#', class: 'how_to_import_link light btn' do = link_to '#', class: 'how_to_import_link light btn' do
%i.fa.fa-heart %i.fa.fa-bitbucket
GitLab.com Bitbucket
= render 'gitlab_import_modal' = render 'bitbucket_import_modal'
= link_to new_import_gitorious_path, class: 'btn' do - unless request.host == 'gitlab.com'
%i.icon-gitorious.icon-gitorious-small - if gitlab_import_enabled?
Gitorious.org = 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 Any 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://username:password@gitlab.company.com/group/project.git'
.alert.alert-info.prepend-top-10
%ul
%li
The repository must be accessible over HTTP(S). If it is not publicly accessible, you can add authentication information to the URL: <code>https://username:password@gitlab.company.com/group/project.git</code>.
%li
The import will time out after 4 minutes. For big repositories, use a clone/push combination.
%li
To migrate an SVN repository, check out #{link_to "this document", "http://doc.gitlab.com/ce/workflow/migrating_from_svn.html"}.
%hr.prepend-botton-10 %hr.prepend-botton-10
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment