summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-06-07 21:30:48 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-06-07 21:30:48 +0000
commitfc1f828b93103e62d47561a79bc97a4aea846324 (patch)
tree2375b89e5540ac97d1f88c8e17e504842a08d680
parent359a8f1fc8df543e648b734acd332374bd779347 (diff)
parentefce25590126d8093ce66b7541938d24a859f1d8 (diff)
downloadgitlab-ce-fc1f828b93103e62d47561a79bc97a4aea846324.tar.gz
Merge branch '33308-use-pre-wrap-for-commit-messages' into 'master'
33308 Use pre-wrap for commit messages to keep lists indented Closes #33308 See merge request !11957
-rw-r--r--app/assets/stylesheets/pages/commits.scss2
-rw-r--r--changelogs/unreleased/33308-use-pre-wrap-for-commit-messages.yml4
2 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/commits.scss b/app/assets/stylesheets/pages/commits.scss
index bb72f453d1b..9db0f2075cb 100644
--- a/app/assets/stylesheets/pages/commits.scss
+++ b/app/assets/stylesheets/pages/commits.scss
@@ -228,7 +228,7 @@
margin: 10px 0;
background: $gray-light;
display: none;
- white-space: pre-line;
+ white-space: pre-wrap;
word-break: normal;
pre {
diff --git a/changelogs/unreleased/33308-use-pre-wrap-for-commit-messages.yml b/changelogs/unreleased/33308-use-pre-wrap-for-commit-messages.yml
new file mode 100644
index 00000000000..43e8f242947
--- /dev/null
+++ b/changelogs/unreleased/33308-use-pre-wrap-for-commit-messages.yml
@@ -0,0 +1,4 @@
+---
+title: Use pre-wrap for commit messages to keep lists indented
+merge_request:
+author: