Automatic merge of gitlab-org/gitlab-ce master

app/assets/stylesheets/components/dashboard_skeleton.scss

+.dashboard-cards {
+  margin-right: -$gl-padding-8;
+  margin-left: -$gl-padding-8;
+}
+
+.dashboard-card {
+  &-header {
+    &-warning {
+      background-color: $orange-100;
+    }
+
+    &-failed {
+      background-color: $red-100;
+    }
+  }
+
+  &-body {
+    height: 120px;
+
+    &-warning {
+      background-color: $orange-50;
+    }
+
+    &-failed {
+      background-color: $red-50;
+    }
+  }
+
+  &-time-ago {
+    &-icon {
+      color: $gray-500;
+    }
+  }
+
+  &-footer {
+    border-radius: $gl-padding;
+    height: $gl-padding-32;
+
+    &-failed {
+      background-color: $red-100;
+    }
+
+    &-arrow {
+      color: $gray-300;
+    }
+
+    &-downstream {
+      margin-right: -$gl-padding-8;
+    }
+
+    &-extra {
+      background-color: $gray-400;
+      font-size: 10px;
+      line-height: $gl-line-height;
+      width: $gl-padding;
+    }
+  }
+
+  &-skeleton-info {
+    border-radius: $gl-padding;
+    height: $gl-padding;
+    overflow: hidden;
+
+    &::after {
+      content: ' ';
+      display: block;
+      animation: blockTextShine 1s linear infinite forwards;
+      background-repeat: no-repeat;
+      background-size: cover;
+      background-image: linear-gradient(to right,
+      $gray-100 0%,
+      $gray-50 20%,
+      $gray-100 40%,
+      $gray-100 100%);
+      border-radius: $gl-padding;
+      height: $gl-padding;
+      margin-top: -$gl-padding-8;
+    }
+  }
+}

doc/development/fe_guide/vuex.md

@@ -52,7 +52,7 @@ The first thing you should do before writing any code is to design the state.
 Often we need to provide data from haml to our Vue application. Let's store it in the state for better access.
 
 ```javascript
-  export default {
+  export default () => ({
     endpoint: null,
 
     isLoading: false,
@@ -62,7 +62,7 @@ Often we need to provide data from haml to our Vue application. Let's store it i
     errorAddingUser: false,
 
     users: [],
-  };
+  });
 ```
 
 #### Access `state` properties