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
This commit is contained in:
commit
82d4760d0d
2 changed files with 53 additions and 51 deletions
|
@ -9,6 +9,7 @@ v 7.10.0 (unreleased)
|
|||
- Improve diff UI
|
||||
- Fix alignment of navbar toggle button (Cody Mize)
|
||||
- Identical look of selectboxes in UI
|
||||
- Move "Import existing repository by URL" option to button.
|
||||
|
||||
v 7.9.0 (unreleased)
|
||||
- Add HipChat integration documentation (Stan Hu)
|
||||
|
|
|
@ -21,64 +21,65 @@
|
|||
= f.select :namespace_id, namespaces_options(params[:namespace_id] || :current_user), {}, {class: 'select2', tabindex: 2}
|
||||
|
||||
%hr
|
||||
.js-toggle-container
|
||||
|
||||
.project-import.js-toggle-container
|
||||
.form-group
|
||||
.col-sm-2
|
||||
%label.control-label Import project from
|
||||
.col-sm-10
|
||||
= link_to "#", class: 'js-toggle-button' do
|
||||
%i.fa.fa-upload
|
||||
%span Import existing repository by URL
|
||||
- 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
|
||||
|
||||
= 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 Import existing git repo
|
||||
%span Git repository URL
|
||||
.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://username:password@gitlab.company.com/group/project.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
|
||||
.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
|
||||
%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
|
||||
|
||||
|
|
Loading…
Reference in a new issue