Automatic merge of gitlab-org/gitlab-ce master

app/assets/stylesheets/framework/system_messages.scss

@@ -98,14 +98,4 @@
     top: auto;
     bottom: auto;
   }
-
-  .content-wrapper {
-    .with-system-header & {
-      margin-top: 0;
-    }
-
-    .with-system-footer & {
-      margin-top: 0;
-    }
-  }
 }

app/views/layouts/fullscreen.html.haml

@@ -11,6 +11,6 @@
       = render "layouts/broadcast"
       = yield :flash_message
       = render "layouts/flash"
-    .content-wrapper{ id: "content-body", class: "d-flex flex-column align-items-stretch" }
+    .content-wrapper{ id: "content-body", class: "d-flex flex-column align-items-stretch mt-0" }
       = yield
     = footer_message