Merge branch 'import-github-scb' into 'master'

Resolve CE/EE diffs in import github

Closes #10497

See merge request gitlab-org/gitlab-ee!13042

app/views/import/github/new.html.haml

@@ -22,9 +22,7 @@
     = text_field_tag :personal_access_token, '', class: 'form-control append-right-8', placeholder: _('Personal Access Token'), size: 40
     = submit_tag _('List your GitHub repositories'), class: 'btn btn-success'
 
-  -# EE-specific start
-  = hidden_field_tag :ci_cd_only, params[:ci_cd_only]
-  -# EE-specific end
+  = render_if_exists 'import/github/ci_cd_only'
 
 - unless github_import_configured?
   %hr

ee/app/views/import/github/_ci_cd_only.html.haml

+= hidden_field_tag :ci_cd_only, params[:ci_cd_only]