diff options
| author | Phil Hughes <me@iamphill.com> | 2019-05-22 07:48:54 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-05-22 07:48:54 +0000 |
| commit | 6d495d6589dc874a623a849b85495569fbffd746 (patch) | |
| tree | 8cab4b37579c5d3c2ee7ac977c717314d4e3215e | |
| parent | 42e564c6b2ea77a10f4b799b71e5a37dcbebde93 (diff) | |
| parent | 44b4a31b40336c7bed36031ff24d092ab421a041 (diff) | |
| download | gitlab-ce-6d495d6589dc874a623a849b85495569fbffd746.tar.gz | |
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
| -rw-r--r-- | app/views/shared/_import_form.html.haml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/views/shared/_import_form.html.haml b/app/views/shared/_import_form.html.haml index 7b593ca4f76..3ee713cf499 100644 --- 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 |