diff options
author | Phil Hughes <me@iamphill.com> | 2019-04-29 17:52:16 +0300 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2019-04-29 17:52:16 +0300 |
commit | 72c179ef26284c4322bf84a7ed40eae11f40b9c4 (patch) | |
tree | e2962f915dbd8e941de4dff71873fef4886c1524 /app/views | |
parent | f832b96ad7f36d3f8b0ed7cb8776ff301410af8e (diff) | |
parent | 558e27e1c472ad13e8814577e8db1a780e2473b9 (diff) |
Merge branch 'ce-11031-ee-diff-projects' into 'master'
CE: Fixes EE differences for app/views/projects/new.html.haml
See merge request gitlab-org/gitlab-ce!27617
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/projects/new.html.haml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml index 95027634de2..d7e16dbd40c 100644 --- a/app/views/projects/new.html.haml +++ b/app/views/projects/new.html.haml @@ -16,6 +16,7 @@ = _('A project is where you house your files (repository), plan your work (issues), and publish your documentation (wiki), %{among_other_things_link}.').html_safe % { among_other_things_link: among_other_things_link } %p = _('All features are enabled for blank projects, from templates, or when importing, but you can disable them afterward in the project settings.') + = render_if_exists 'projects/new_ci_cd_banner_external_repo' %p - pages_getting_started_guide = link_to _('Pages getting started guide'), help_page_path("user/project/pages/getting_started_part_two", anchor: "fork-a-project-to-get-started-from"), target: '_blank' = _('Information about additional Pages templates and how to install them can be found in our %{pages_getting_started_guide}.').html_safe % { pages_getting_started_guide: pages_getting_started_guide } @@ -42,6 +43,7 @@ %a.nav-link{ href: '#import-project-pane', id: 'import-project-tab', data: { toggle: 'tab', track_label: 'import_project', track_event: "click_tab" }, role: 'tab' } %span.d-none.d-sm-block Import project %span.d-block.d-sm-none Import + = render_if_exists 'projects/new_ci_cd_only_project_tab', active_tab: active_tab .tab-content.gitlab-tab-content .tab-pane{ id: 'blank-project-pane', class: active_when(active_tab == 'blank'), role: 'tabpanel' } @@ -68,6 +70,8 @@ %h4 No import options available %p Contact an administrator to enable options for importing your project. + = render_if_exists 'projects/new_ci_cd_only_project_pane', active_tab: active_tab + .save-project-loader.d-none .center %h2 |