diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-25 15:10:23 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-25 15:10:23 +0300 |
commit | 76ef00aac974a463243dcda6f692b17ff5d439bc (patch) | |
tree | 21645caa87c2cdd5cc15195c7a402e52c58f73c4 /app/views/layouts/application.html.haml | |
parent | 686c2375e1c9c559e3e7e04a8fbfbdafd9671932 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/layouts/application.html.haml')
-rw-r--r-- | app/views/layouts/application.html.haml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 58408ec822c..47c092e199a 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -1,10 +1,12 @@ - page_classes = page_class << @html_class - page_classes = page_classes.flatten.compact +- body_classes = [user_application_theme, user_tab_width, @body_class, client_class_list] +- body_classes << 'sidebar-refactoring' if sidebar_refactor_enabled? !!! 5 %html{ lang: I18n.locale, class: page_classes } = render "layouts/head" - %body{ class: "#{user_application_theme} #{user_tab_width} #{@body_class} #{client_class_list}", data: body_data } + %body{ class: body_classes, data: body_data } = render "layouts/init_auto_complete" if @gfm_form = render "layouts/init_client_detection_flags" = render 'peek/bar' |