5 commits

Author	SHA1	Message	Date
Jacob Vosmaer	51574d779c	Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into lazy-blobs	2016-02-01 13:51:05 +01:00
Douwe Maan	5c7259c7c3	Don't crash when file can't be highlighted	2016-01-19 15:13:37 +01:00
Douwe Maan	512bebe21d	Refactor Gitlab::Highlight and fix tests	2016-01-19 14:52:41 +01:00
Douwe Maan	8dfad143d4	Add inline diff markers in highlighted diffs.	2016-01-14 22:28:07 +01:00
Douwe Maan	3a1d053599	Remove duplication around highlighting.	2016-01-14 15:11:50 +01:00