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

Resolve CE/EE diffs in import form Closes gitlab-ee#10492 See merge request gitlab-org/gitlab-ce!28575
2019-05-22 07:48:54 +00:00 · 2019-05-22 07:48:54 +00:00 · 6d495d6589
parent 42e564c6b2 44b4a31b40
commit 6d495d6589
1 changed files with 3 additions and 0 deletions
--- a/app/views/shared/_import_form.html.haml
+++ b/app/views/shared/_import_form.html.haml
@ -18,3 +18,6 @@
          = import_will_timeout_message(ci_cd_only)
        %li
          = import_svn_message(ci_cd_only)
+        = render_if_exists 'shared/ci_cd_only_link', ci_cd_only: ci_cd_only
+
+= render_if_exists 'shared/ee/import_form', f: f, ci_cd_only: ci_cd_only