Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
This commit is contained in:
commit
f79f758581
|
@ -33,7 +33,7 @@ v 7.8.0
|
|||
-
|
||||
-
|
||||
-
|
||||
-
|
||||
- Fix long broadcast message cut-off on left sidebar (Visay Keo)
|
||||
- Add Project Avatars (Steven Thonus and Hannes Rosenögger)
|
||||
-
|
||||
-
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
- if defined?(sidebar)
|
||||
.page-with-sidebar
|
||||
= render "layouts/broadcast"
|
||||
.sidebar-wrapper
|
||||
= render(sidebar)
|
||||
.content-wrapper
|
||||
|
|
|
@ -2,6 +2,5 @@
|
|||
%html{ lang: "en"}
|
||||
= render "layouts/head", title: "Admin area"
|
||||
%body{class: "#{app_theme} #{theme_type} admin", :'data-page' => body_data_page}
|
||||
= render "layouts/broadcast"
|
||||
= render "layouts/head_panel", title: "Admin area"
|
||||
= render 'layouts/page', sidebar: 'layouts/nav/admin'
|
||||
|
|
|
@ -2,6 +2,5 @@
|
|||
%html{ lang: "en"}
|
||||
= render "layouts/head", title: "Dashboard"
|
||||
%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'
|
||||
|
|
|
@ -2,6 +2,5 @@
|
|||
%html{ lang: "en"}
|
||||
= render "layouts/head", title: group_head_title
|
||||
%body{class: "#{app_theme} #{theme_type} application", :'data-page' => body_data_page}
|
||||
= render "layouts/broadcast"
|
||||
= render "layouts/head_panel", title: @group.name
|
||||
= render 'layouts/page', sidebar: 'layouts/nav/group'
|
||||
|
|
|
@ -2,6 +2,5 @@
|
|||
%html{ lang: "en"}
|
||||
= render "layouts/head", title: "Profile"
|
||||
%body{class: "#{app_theme} #{theme_type} profile", :'data-page' => body_data_page}
|
||||
= render "layouts/broadcast"
|
||||
= render "layouts/head_panel", title: "Profile"
|
||||
= render 'layouts/page', sidebar: 'layouts/nav/profile'
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
%html{ lang: "en"}
|
||||
= render "layouts/head", title: @project.name_with_namespace
|
||||
%body{class: "#{app_theme} #{theme_type} project", :'data-page' => body_data_page, :'data-project-id' => @project.id }
|
||||
= render "layouts/broadcast"
|
||||
= render "layouts/head_panel", title: project_title(@project)
|
||||
= render "layouts/init_auto_complete"
|
||||
- @project_settings_nav = true
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
%html{ lang: "en"}
|
||||
= render "layouts/head", title: project_head_title
|
||||
%body{class: "#{app_theme} #{theme_type} project", :'data-page' => body_data_page, :'data-project-id' => @project.id }
|
||||
= render "layouts/broadcast"
|
||||
= render "layouts/head_panel", title: project_title(@project)
|
||||
= render "layouts/init_auto_complete"
|
||||
= render 'layouts/page', sidebar: 'layouts/nav/project'
|
||||
|
|
|
@ -2,6 +2,5 @@
|
|||
%html{ lang: "en"}
|
||||
= render "layouts/head", title: group_head_title
|
||||
%body{class: "#{app_theme} #{theme_type} application", :'data-page' => body_data_page}
|
||||
= render "layouts/broadcast"
|
||||
= render "layouts/public_head_panel", title: "group: #{@group.name}"
|
||||
= render 'layouts/page', sidebar: 'layouts/nav/group'
|
||||
|
|
|
@ -2,6 +2,5 @@
|
|||
%html{ lang: "en"}
|
||||
= render "layouts/head", title: @project.name_with_namespace
|
||||
%body{class: "#{app_theme} #{theme_type} application", :'data-page' => body_data_page}
|
||||
= render "layouts/broadcast"
|
||||
= render "layouts/public_head_panel", title: project_title(@project)
|
||||
= render 'layouts/page', sidebar: 'layouts/nav/project'
|
||||
|
|
|
@ -2,6 +2,5 @@
|
|||
%html{ lang: "en"}
|
||||
= render "layouts/head", title: @title
|
||||
%body{class: "#{app_theme} #{theme_type} application", :'data-page' => body_data_page}
|
||||
= render "layouts/broadcast"
|
||||
= render "layouts/public_head_panel", title: @title
|
||||
= render 'layouts/page'
|
||||
|
|
Loading…
Reference in New Issue