Merge branch 'new-breadcrumbs-alerts-below' into 'master'

Moves alert boxes to below the breadcrumbs

See merge request !12631

app/views/layouts/_page.html.haml

@@ -12,10 +12,12 @@
   .content-wrapper{ class: "#{(layout_nav_class unless show_new_nav?)}" }
     .alert-wrapper
       = render "layouts/broadcast"
+      - if show_new_nav?
+        - if content_for?(:new_global_flash)
+          = yield :new_global_flash
+        = render "layouts/nav/breadcrumbs"
       = render "layouts/flash"
       = yield :flash_message
-    - if show_new_nav?
-      = render "layouts/nav/breadcrumbs"
     %div{ class: "#{(container_class unless @no_container)} #{@content_class}" }
       .content{ id: "content-body" }
         = yield

app/views/projects/empty.html.haml

 - @no_container = true
-= content_for :flash_message do
+- flash_message_container = show_new_nav? ? :new_global_flash : :flash_message
+= content_for flash_message_container do
   - if current_user && can?(current_user, :download_code, @project)
     = render 'shared/no_ssh'
     = render 'shared/no_password'

app/views/projects/show.html.haml

 - @no_container = true
+- flash_message_container = show_new_nav? ? :new_global_flash : :flash_message
 = content_for :meta_tags do
   = auto_discovery_link_tag(:atom, project_path(@project, rss_url_options), title: "#{@project.name} activity")
-= content_for :flash_message do
+= content_for flash_message_container do
   - if current_user && can?(current_user, :download_code, @project)
     = render 'shared/no_ssh'
     = render 'shared/no_password'