Merge branch 'diff-stats-perf-bar' into 'master'

Filipa Lacerda · Filipa Lacerda · commit bca250783d3c · 2018-10-16T13:18:45.000Z
Fixes diff stats not being visible with performance bar

See merge request gitlab-org/gitlab-ce!22390
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss
@@ -1013,6 +1013,7 @@
 
   .with-performance-bar & {
     top: 135px;
+    max-height: calc(100vh - 135px);
   }
 }
 
diff --git a/changelogs/unreleased/diff-stats-perf-bar.yml b/changelogs/unreleased/diff-stats-perf-bar.yml
@@ -0,0 +1,5 @@
+---
+title: Fixed diff stats not showing when performance bar is enabled
+merge_request:
+author:
+type: fixed
