Automatic merge of gitlab-org/gitlab-ce master

app/assets/javascripts/boards/components/board_list.vue

@@ -221,7 +221,7 @@ export default {
 </script>
 
 <template>
-  <div class="board-list-component d-flex flex-column">
+  <div class="board-list-component">
     <div v-if="loading" class="board-list-loading text-center" aria-label="Loading issues">
       <gl-loading-icon />
     </div>

app/assets/stylesheets/pages/boards.scss

@@ -201,6 +201,13 @@
       display: none;
     }
   }
+
+  &:not(.is-collapsed) {
+    .board-list-component {
+      display: flex;
+      flex-direction: column;
+    }
+  }
 }
 
 .board-inner {