Commit 70ddbfc3 authored by Douwe Maan's avatar Douwe Maan Committed by Ruben Davila

Merge branch 'zj-fix-gitlab-import' into 'master'

Fix GitLab import button

cc @MrChrisW  

Closes gitlab-org/gitlab-ce#21795

See merge request !6167
parent 86f56119
......@@ -144,6 +144,7 @@ v 8.11.5
- Fix confidential issues being exposed as public using gitlab.com export
- Remove gitorious from import_sources. !6180
- Scope webhooks/services that will run for confidential issues
- Fix GitLab import button
v 8.11.4
- Fix resolving conflicts on forks. !6082
......
......@@ -55,7 +55,7 @@
= render 'bitbucket_import_modal'
%div
- if gitlab_import_enabled?
= link_to status_import_gitlab_path, class: "btn import_gitlab #{'how_to_import_link' unless bitbucket_import_configured?}" do
= link_to status_import_gitlab_path, class: "btn import_gitlab #{'how_to_import_link' unless gitlab_import_configured?}" do
= icon('gitlab', text: 'GitLab.com')
- unless gitlab_import_configured?
= render 'gitlab_import_modal'
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment