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

CHANGELOG

@@ -77,6 +77,7 @@ v 8.12.0 (unreleased)
 v 8.11.5 (unreleased)
   - Optimize branch lookups and force a repository reload for Repository#find_branch
   - Fix suggested colors options for new labels in the admin area. !6138
+  - Fix GitLab import button
 
 v 8.11.4
   - Fix resolving conflicts on forks. !6082

app/views/projects/new.html.haml

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