diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-08-10 15:55:44 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-08-10 15:55:44 +0000 |
| commit | 6e7bf50ba6d0d9eb896c1abef8dda8a4997c3088 (patch) | |
| tree | 86471a94af7ad743e4c540c14b53a96cda21c38a /doc/workflow | |
| parent | 39bda5d05e96ff9b2b8a89852b9520e8f262051e (diff) | |
| parent | 15d5dfdb33c94ccfd7843f2be35bac2d74abe03e (diff) | |
| download | gitlab-ce-6e7bf50ba6d0d9eb896c1abef8dda8a4997c3088.tar.gz | |
Merge branch 'fix-diff-highlighting' into 'master'
Fix diff syntax highlighting
### What does this MR do?
This MR fixes a syntax highlighting issue that that manifested itself when a user tried the following:
```
+aaa
+bbb
ccc
```
However, a regression in 0abe98f0 caused the last line to be put on the second to last line:
Instead of this:
This bug occurred because of some error in the logic of handling new lines in the content. Refactored HTML parser to avoid duplication of newline parsing.
### What are the relevant issue numbers?
Closes #2235
See merge request !1126
Diffstat (limited to 'doc/workflow')
0 files changed, 0 insertions, 0 deletions