Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

CHANGELOG

@@ -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)
   - 
   - 

app/views/layouts/_page.html.haml

 - if defined?(sidebar)
   .page-with-sidebar
+    = render "layouts/broadcast"
     .sidebar-wrapper
       = render(sidebar)
     .content-wrapper

app/views/layouts/admin.html.haml

@@ -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'

app/views/layouts/application.html.haml

@@ -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'

app/views/layouts/group.html.haml

@@ -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'

app/views/layouts/profile.html.haml

@@ -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'

app/views/layouts/project_settings.html.haml

@@ -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

app/views/layouts/projects.html.haml

@@ -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'

app/views/layouts/public_group.html.haml

@@ -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'

app/views/layouts/public_projects.html.haml

@@ -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'

app/views/layouts/public_users.html.haml

@@ -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'