Merge branch 'ce-to-ee-2018-07-26' into 'master'

CE upstream - 2018-07-26 03:21 UTC

Closes gitlab-ui#11

See merge request gitlab-org/gitlab-ee!6674

app/assets/stylesheets/pages/diff.scss

@@ -16,6 +16,7 @@
 
     svg {
       vertical-align: middle;
+      top: -1px;
     }
   }
 

app/assets/stylesheets/pages/issuable.scss

@@ -856,18 +856,6 @@
     }
   }
 
-  .meter-container {
-    background: $border-gray-light;
-    border-radius: 3px;
-
-    .meter-fill {
-      max-width: 100%;
-      height: 5px;
-      border-radius: 3px;
-      background: $gl-primary;
-    }
-  }
-
   .compare-display-container {
     display: flex;
     justify-content: space-between;