summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorJacob Schatz <jschatz1@gmail.com>2016-01-18 00:34:17 +0000
committerJacob Schatz <jschatz1@gmail.com>2016-01-18 00:34:17 +0000
commit80be924546888f0b64a96fcbe177252bade0c996 (patch)
tree553d2bc6fae77196c714cef7baba622d7faffd98 /app
parent5433637d300f62fde4421d63929016caa1ef47a4 (diff)
parent6f1a59b8ed6bbe8d2c0b25bdbb82102e7b29cafd (diff)
downloadgitlab-ce-80be924546888f0b64a96fcbe177252bade0c996.tar.gz
Merge branch 'diff-white-line-fix' into 'master'
Removes white line when hiding diff comments in MR Fixes #6071 See merge request !2407
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/pages/diff.scss1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss
index 1e2b8b51827..04e9a58e1cf 100644
--- a/app/assets/stylesheets/pages/diff.scss
+++ b/app/assets/stylesheets/pages/diff.scss
@@ -66,6 +66,7 @@
width: 100%;
font-family: $monospace_font;
border: none;
+ border-collapse: separate;
margin: 0px;
padding: 0px;
.line_holder td {