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

..

api

Fix corrupted binary files when using API files endpoint

2015-08-09 15:23:22 -07:00

assets

move assets from lib directory to vendor

2012-05-29 17:56:48 +05:00

backup

Merge branch 'master' of github.com:gitlabhq/gitlabhq

2015-08-03 11:04:04 +02:00

gitlab

Merge branch 'rs-reference-data-attrs' into 'master'

2015-08-10 00:07:56 +00:00

omni_auth

Add reset_session for the :reset_session strategy.

2015-04-24 20:10:32 +02:00

redcarpet/render

Replace Rugments with Rouge

2015-07-29 07:40:58 +02:00

rouge/formatters

Fix diff syntax highlighting

2015-08-10 08:07:26 -07:00

support

Experimental support for gitlab-git-http-server

2015-07-28 14:33:19 +02:00

tasks

Merge branch 'master' into drop-satellites

2015-08-04 16:42:36 +02:00

disable_email_interceptor.rb

Add email interceptor to prevent mail sending if email sending is disabled.

2014-10-27 13:05:50 +01:00

email_validator.rb

More rubocop rules enable

2015-02-02 21:31:03 -08:00

event_filter.rb

Add parenthesis to function def with arguments.

2014-10-03 09:18:46 +02:00

extracts_path.rb

Fix "Network" and "Graphs" pages for branches with encoded slashes

2015-08-02 00:07:23 -07:00

file_size_validator.rb

Support configurable attachment size via Application Settings

2015-04-02 00:04:08 -07:00

gitlab.rb

Fix application initialize

2015-07-15 15:59:38 +02:00

gt_one_coercion.rb

diff unfold

2014-08-14 15:48:14 +04:00

repository_cache.rb

Store commit count in project table

2015-07-17 15:22:56 +02:00

static_model.rb

Fixed styles, ProjectHook specs etc

2013-01-05 00:35:38 +02:00

unfold_form.rb

Gitlab Issue 707: Indent unfolded code 1 character

2015-07-22 09:58:17 -04:00

version_check.rb

Replace host with real one

2015-05-11 18:21:45 +03:00