diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-25 09:21:45 -0800 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-25 09:21:45 -0800 |
commit | a52529f9b6258b2ae2793930096c3fcbe40078f3 (patch) | |
tree | fc28baed1a41a50892215c94ccee3f2eddf9772c /app/views/projects/new.html.haml | |
parent | 7475f4f00d999a603eb01a0b70a966db1cd243d8 (diff) | |
parent | 56f51bed6b166f12b8b0f4f1bd883142c5e079a6 (diff) | |
download | gitlab-ce-a52529f9b6258b2ae2793930096c3fcbe40078f3.tar.gz |
Merge branch 'bitbucket-import'
Conflicts:
app/views/import/gitorious/status.html.haml
db/schema.rb
Diffstat (limited to 'app/views/projects/new.html.haml')
-rw-r--r-- | app/views/projects/new.html.haml | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml index b41d5f52d12..025c4fd5506 100644 --- a/app/views/projects/new.html.haml +++ b/app/views/projects/new.html.haml @@ -53,6 +53,19 @@ Import projects from GitHub = render 'github_import_modal' + .project-import.form-group + .col-sm-2 + .col-sm-10 + - if bitbucket_import_enabled? + = link_to status_import_bitbucket_path do + %i.fa.fa-bitbucket + Import projects from Bitbucket + - else + = link_to '#', class: 'how_to_import_link light' do + %i.fa.fa-bitbucket + Import projects from Bitbucket + = render 'bitbucket_import_modal' + - unless request.host == 'gitlab.com' .project-import.form-group .col-sm-2 |