summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz1@gmail.com>2016-04-07 18:28:48 +0000
committerJacob Schatz <jschatz1@gmail.com>2016-04-07 18:28:48 +0000
commit1060467bb8f1ce6886b05436d16f95996da2fa91 (patch)
tree3d6ee99b9e0b4904f03467ef082a77d9a44e8ac8
parentf79d3cda351719785b34e4557b2d88736bc191ef (diff)
parenta81fcf8bd677db5846ca67e8cb13731ee259e142 (diff)
downloadgitlab-ce-1060467bb8f1ce6886b05436d16f95996da2fa91.tar.gz
Merge branch 'indentation-bug' into 'master'
Preserve white space See merge request !3602
-rw-r--r--app/assets/stylesheets/pages/diff.scss6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss
index 7a12aa96476..939555bb260 100644
--- a/app/assets/stylesheets/pages/diff.scss
+++ b/app/assets/stylesheets/pages/diff.scss
@@ -63,10 +63,10 @@
.line_holder td {
line-height: $code_line_height;
font-size: $code_font_size;
- }
- td {
- white-space: nowrap;
+ span {
+ white-space: pre;
+ }
}
}