kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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
This commit is contained in:
Filipa Lacerda 2017-08-29 12:10:41 +00:00
parent 1b9c318cae 80f657c05e
commit 418f01a6c4
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/views/projects/new.html.haml
View File

@ -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

5
changelogs/unreleased/36882-disable-gitlab-project-import-button-if-source-disabled.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Disable GitLab Project Import Button if source disabled
merge_request:
author:
type: fixed