diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-10-16 16:18:45 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-10-16 16:18:45 +0300 |
| commit | bca250783d3cea9b807b905d93e6b8b5fd513433 (patch) | |
| tree | 26e80cf45251700cb6de71fcc07759e7bc5e71df | |
| parent | 396d205e5a503f9f48c223804087a80f7acc6d06 (diff) | |
| parent | 809c9d7dc8a00344f89546cec1ff0a772f58a1be (diff) | |
Merge branch 'diff-stats-perf-bar' into 'master'
Fixes diff stats not being visible with performance bar
See merge request gitlab-org/gitlab-ce!22390
| -rw-r--r-- | app/assets/stylesheets/pages/diff.scss | 1 | ||||
| -rw-r--r-- | changelogs/unreleased/diff-stats-perf-bar.yml | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss index cba5324ce53..8d884ad6891 100644 --- 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 new file mode 100644 index 00000000000..52d70d4537f --- /dev/null +++ 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 |