summaryrefslogtreecommitdiff
path: root/app/views/layouts
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-19 09:07:39 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-19 09:07:39 +0000
commite3d67bcff7b8bc6a453d0814d404a9a61d97bc0f (patch)
tree75cafd958ccb2c1977815f1b001b29a0ce17d90b /app/views/layouts
parent6287caa6fad6e2b69c23bdba3bcca6bdfd82c8ff (diff)
downloadgitlab-ce-e3d67bcff7b8bc6a453d0814d404a9a61d97bc0f.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/layouts')
-rw-r--r--app/views/layouts/application.html.haml5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index f4ab491a38e..7af190f5a0b 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -1,5 +1,8 @@
+- page_classes = page_class << @html_class
+- page_classes = page_classes.flatten.compact
+
!!! 5
-%html{ lang: I18n.locale, class: page_class }
+%html{ lang: I18n.locale, class: page_classes }
= render "layouts/head"
%body{ class: "#{user_application_theme} #{@body_class} #{client_class_list}", data: body_data }
= render "layouts/init_auto_complete" if @gfm_form