diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-12-21 01:20:51 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-12-21 01:20:51 +0200 |
| commit | e45e6ba2c3e25afb138e5f0ece71c6f677f2ab86 (patch) | |
| tree | d648ae6a8335ceda3007b881427ce4a7770cff56 /app/views/layouts/application.html.haml | |
| parent | bcc04adb1342155d4ec2b670702406285145cb32 (diff) | |
| parent | 0f7d47f695afa051374996cb1c72bc3ec55820c5 (diff) | |
| download | gitlab-ce-e45e6ba2c3e25afb138e5f0ece71c6f677f2ab86.tar.gz | |
Merge branch 'master' into sidebar-nav
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/views/layouts/group.html.haml
Diffstat (limited to 'app/views/layouts/application.html.haml')
| -rw-r--r-- | app/views/layouts/application.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index ec53c4b1508..d40c9753b10 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -1,7 +1,7 @@ !!! 5 %html{ lang: "en"} = render "layouts/head", title: "Dashboard" - %body{class: "#{app_theme} application", :'data-page' => body_data_page } + %body{class: "#{app_theme} #{theme_type} application", :'data-page' => body_data_page } = render "layouts/broadcast" = render "layouts/head_panel", title: "Dashboard" = render 'layouts/page', sidebar: 'layouts/nav/dashboard' |