Commit 6d495d65 authored by Phil Hughes's avatar Phil Hughes

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
parents 42e564c6 44b4a31b
...@@ -18,3 +18,6 @@ ...@@ -18,3 +18,6 @@
= import_will_timeout_message(ci_cd_only) = import_will_timeout_message(ci_cd_only)
%li %li
= import_svn_message(ci_cd_only) = 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
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