summaryrefslogtreecommitdiff
path: root/app/views/layouts
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-09-11 15:44:42 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-09-11 15:44:42 +0000
commit9b177bb7c94df6c7d3868235f75939a41acf8718 (patch)
treeef8541d3ef8047f2ac6711b6e030244f812b7b49 /app/views/layouts
parent73a913f2b5f2a5dd36e13e09d74264d1da218d6a (diff)
downloadgitlab-ce-9b177bb7c94df6c7d3868235f75939a41acf8718.tar.gz
Revert "Merge branch 'revert-f2421b2b' into 'master'"revert-2f46c3a8
This reverts merge request !14148
Diffstat (limited to 'app/views/layouts')
-rw-r--r--app/views/layouts/application.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 65ac8aaa59b..0ca34b276a7 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -1,7 +1,7 @@
!!! 5
%html{ lang: I18n.locale, class: page_class }
= render "layouts/head"
- %body{ class: @body_class, data: { page: body_data_page, project: "#{@project.path if @project}", group: "#{@group.path if @group}", find_file: find_file_path } }
+ %body{ class: "#{user_application_theme} #{@body_class}", data: { page: body_data_page, project: "#{@project.path if @project}", group: "#{@group.path if @group}", find_file: find_file_path } }
= render "layouts/init_auto_complete" if @gfm_form
= render 'peek/bar'
= render "layouts/header/default"