diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-10-16 16:17:39 +0000 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-10-16 16:17:39 +0000 |
commit | c021e8db8d2f5ddf0726bac6cbc7d8e7e85e441d (patch) | |
tree | 4ee8d5b875c96e2aa7cfa536c820891a531401d4 | |
parent | 7996be6070439f6faf379c116764ea45090fb930 (diff) | |
parent | 7f4e1bd45250d0cddd14f87231ce937d2c3a6337 (diff) | |
download | gitlab-ce-c021e8db8d2f5ddf0726bac6cbc7d8e7e85e441d.tar.gz |
Merge branch '39035-move-gitlab-export-to-top-import-list' into 'master'
39035 Move GitLab export option to top of import list when creating a new project
Closes #39035
See merge request gitlab-org/gitlab-ce!14830
-rw-r--r-- | app/views/projects/new.html.haml | 8 | ||||
-rw-r--r-- | changelogs/unreleased/39035-move-gitlab-export-to-top-import-list.yml | 5 |
2 files changed, 9 insertions, 4 deletions
diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml index 0a835dcdeb0..0a7880ce4cd 100644 --- a/app/views/projects/new.html.haml +++ b/app/views/projects/new.html.haml @@ -54,6 +54,10 @@ = f.label :visibility_level, class: 'label-light' do #the label here seems wrong Import project from .import-buttons + - if gitlab_project_import_enabled? + .import_gitlab_project.has-tooltip{ data: { container: 'body' } } + = link_to new_import_gitlab_project_path, class: 'btn btn_import_gitlab_project project-submit' do + = icon('gitlab', text: 'GitLab export') %div - if github_import_enabled? = link_to new_import_github_path, class: 'btn import_github' do @@ -87,10 +91,6 @@ - if git_import_enabled? %button.btn.js-toggle-button.import_git{ type: "button" } = icon('git', text: 'Repo by URL') - - if gitlab_project_import_enabled? - .import_gitlab_project.has-tooltip{ data: { container: 'body' } } - = link_to new_import_gitlab_project_path, class: 'btn btn_import_gitlab_project project-submit' do - = icon('gitlab', text: 'GitLab export') .col-lg-12 .js-toggle-content.hide.toggle-import-form %hr diff --git a/changelogs/unreleased/39035-move-gitlab-export-to-top-import-list.yml b/changelogs/unreleased/39035-move-gitlab-export-to-top-import-list.yml new file mode 100644 index 00000000000..4b90d68d80c --- /dev/null +++ b/changelogs/unreleased/39035-move-gitlab-export-to-top-import-list.yml @@ -0,0 +1,5 @@ +--- +title: 14830 Move GitLab export option to top of import list when creating a new project +merge_request: +author: +type: changed |