Merge branch 'ce-to-ee-2018-06-30' into 'master'

CE upstream - 2018-06-30 00:21 UTC

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

app/assets/javascripts/diffs/components/diff_file_header.vue

@@ -112,7 +112,11 @@ export default {
   },
   methods: {
     handleToggle(e, checkTarget) {
-      if (!checkTarget || e.target === this.$refs.header) {
+      if (
+        !checkTarget ||
+        e.target === this.$refs.header ||
+        (e.target.classList && e.target.classList.contains('diff-toggle-caret'))
+      ) {
         this.$emit('toggleFile');
       }
     },

app/assets/stylesheets/pages/diff.scss

@@ -14,8 +14,8 @@
       background-color: $gray-normal;
     }
 
-    .diff-toggle-caret {
-      padding-right: 6px;
+    svg {
+      vertical-align: text-bottom;
     }
   }