From e3d67bcff7b8bc6a453d0814d404a9a61d97bc0f Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 19 Dec 2019 09:07:39 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/views/layouts/application.html.haml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'app/views/layouts/application.html.haml') 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 -- cgit v1.2.1