Merge branch 'feat/jh-custom-global-footer' into 'master'

Feat: JH custom global footer See merge request gitlab-org/gitlab!66920

Merge branch 'feat/jh-custom-global-footer' into 'master'
Feat: JH custom global footer See merge request gitlab-org/gitlab!66920
ecf979f0 · Phil Hughes · 0d810073 · b744bdcd · ecf979f0
Commit ecf979f0 authored Jul 30, 2021 by Phil Hughes
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

app/views/layouts/_page.html.haml app/views/layouts/_page.html.haml +2 -0

No files found.
--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
@@ -28,5 +28,7 @@
        = yield :before_content
        = yield
    = yield :after_content
+    -# This is needed by [GitLab JH](https://gitlab.com/gitlab-jh/jh-team/gitlab-cn/-/issues/81)
+    = render_if_exists "shared/footer/global_footer"

 = render "layouts/nav/top_nav_responsive", class: 'layout-page content-wrapper-margin'