diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-04-02 14:26:59 +0000 |
|---|---|---|
| committer | Alexandru Croitor <acroitor@gitlab.com> | 2019-02-21 17:55:51 +0200 |
| commit | 28e1739a3fd8c93e4805fe0053faf820cec4e1bc (patch) | |
| tree | e4f8e3e45155c2410d2e5fb9e3f02be4175acf37 /app/views/layouts | |
| parent | c8bf9f78f3e481cb7e74384fa45b46b864fa523a (diff) | |
| download | gitlab-ce-28e1739a3fd8c93e4805fe0053faf820cec4e1bc.tar.gz | |
Port EE System Header And Footer feature to CE
remove EE specific code
remove EE licence checks
move migration from EE to CE folder structure
move specs from EE to CE folder structure
remove EE specific flag specs
Diffstat (limited to 'app/views/layouts')
| -rw-r--r-- | app/views/layouts/application.html.haml | 4 | ||||
| -rw-r--r-- | app/views/layouts/devise.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/devise_empty.html.haml | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 4373240001e..043cca6ad38 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -5,7 +5,9 @@ = render "layouts/init_auto_complete" if @gfm_form = render "layouts/init_client_detection_flags" = render 'peek/bar' - = render partial: "layouts/header/default", locals: { project: @project, group: @group } + = header_message + = render partial: "layouts/header/default", locals: { project: @project, group: @group } = render 'layouts/page', sidebar: sidebar, nav: nav + = footer_message = yield :scripts_body diff --git a/app/views/layouts/devise.html.haml b/app/views/layouts/devise.html.haml index 6003d973c88..2f3c13aaf6e 100644 --- a/app/views/layouts/devise.html.haml +++ b/app/views/layouts/devise.html.haml @@ -2,6 +2,7 @@ %html.devise-layout-html{ class: system_message_class } = render "layouts/head" %body.ui-indigo.login-page.application.navless.qa-login-page{ data: { page: body_data_page } } + = header_message .page-wrap = render "layouts/header/empty" .login-page-broadcast @@ -34,3 +35,4 @@ = link_to _("Explore"), explore_root_path = link_to _("Help"), help_path = link_to _("About GitLab"), "https://about.gitlab.com/" + = footer_message diff --git a/app/views/layouts/devise_empty.html.haml b/app/views/layouts/devise_empty.html.haml index 663e5b24368..6c9c8aa4431 100644 --- a/app/views/layouts/devise_empty.html.haml +++ b/app/views/layouts/devise_empty.html.haml @@ -2,6 +2,7 @@ %html{ lang: "en", class: system_message_class } = render "layouts/head" %body.ui-indigo.login-page.application.navless + = header_message = render "layouts/header/empty" = render "layouts/broadcast" .container.navless-container @@ -15,3 +16,4 @@ = link_to _("Explore"), explore_root_path = link_to _("Help"), help_path = link_to _("About GitLab"), "https://about.gitlab.com/" + = footer_message |