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

Resolve CE/EE diffs in import github Closes gitlab-ee#10497 See merge request gitlab-org/gitlab-ce!28523

Merge branch 'import-github-scb' into 'master'
Resolve CE/EE diffs in import github Closes gitlab-ee#10497 See merge request gitlab-org/gitlab-ce!28523
611ef0bc · Phil Hughes · 8dd687bd · a42fab08 · 611ef0bc
--- a/app/views/import/github/new.html.haml
+++ b/app/views/import/github/new.html.haml
@@ -22,6 +22,8 @@
    = 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'

+  = render_if_exists 'import/github/ci_cd_only'
+
 - unless github_import_configured?
  %hr
  %p