gitlabhq

mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 00:26:07 +10:00

Files

T

Douwe Maan 6e7bf50ba6 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

2015-08-10 15:55:44 +00:00

controllers

Show incompatible projects in Bitbucket import status

2015-08-07 07:07:08 -07:00

factories

Allow users to send abuse reports

2015-08-06 14:03:27 +02:00

features

Fix spec

2015-08-06 17:15:37 +02:00

finders

Add Group#add_* convenience methods