Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-08-10 18:55:44 +0300
committerDouwe Maan <douwe@gitlab.com>2015-08-10 18:55:44 +0300
commit6e7bf50ba6d0d9eb896c1abef8dda8a4997c3088 (patch)
tree86471a94af7ad743e4c540c14b53a96cda21c38a /CHANGELOG
parent39bda5d05e96ff9b2b8a89852b9520e8f262051e (diff)
parent15d5dfdb33c94ccfd7843f2be35bac2d74abe03e (diff)
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: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/a16515499d5e3fd9737370d89c73f671/image.png) Instead of this: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/59eca6efd4c290aa633b9fb54c98a70e/image.png) 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 'CHANGELOG')
0 files changed, 0 insertions, 0 deletions