diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-08-29 12:10:41 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-08-29 12:10:41 +0000 |
| commit | 418f01a6c4ccfafcad043122465357e38b7b462e (patch) | |
| tree | 572735ef5bc3168c90a269287aa973a1e5ef54f9 | |
| parent | 1b9c318cae7f9eed1814793c553190f90cd3ab47 (diff) | |
| parent | 80f657c05e8cd2f87abb4525695af19181607f04 (diff) | |
| download | gitlab-ce-418f01a6c4ccfafcad043122465357e38b7b462e.tar.gz | |
Merge branch '36882-disable-gitlab-project-import-button-if-source-disabled' into 'master'
Disable GitLab Project Import Button if source disabled
Closes #36882
See merge request !13789
| -rw-r--r-- | app/views/projects/new.html.haml | 7 | ||||
| -rw-r--r-- | changelogs/unreleased/36882-disable-gitlab-project-import-button-if-source-disabled.yml | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml index 647e0a772b1..5698bb281b4 100644 --- a/app/views/projects/new.html.haml +++ b/app/views/projects/new.html.haml @@ -68,9 +68,10 @@ - if git_import_enabled? %button.btn.js-toggle-button.import_git{ type: "button" } = icon('git', text: 'Repo by URL') - .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') + - 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') .row .col-lg-12 diff --git a/changelogs/unreleased/36882-disable-gitlab-project-import-button-if-source-disabled.yml b/changelogs/unreleased/36882-disable-gitlab-project-import-button-if-source-disabled.yml new file mode 100644 index 00000000000..a06c84c30e6 --- /dev/null +++ b/changelogs/unreleased/36882-disable-gitlab-project-import-button-if-source-disabled.yml @@ -0,0 +1,5 @@ +--- +title: Disable GitLab Project Import Button if source disabled +merge_request: +author: +type: fixed |