diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-05-20 19:16:48 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-05-20 19:16:48 +0300 |
| commit | 9fe8c74d045b60b3190c571fffe049fa87032dbc (patch) | |
| tree | 5e2372c6b39f2ddc57d2aed02685430112f53a10 /bin | |
| parent | 76a758234ac29ba2c859cb50fec6e6374e4a8742 (diff) | |
| parent | dfce7b62f7e126a0891f81abc0bda20cfb7a58b5 (diff) | |
Merge branch 'lexer_error_workaround' into 'master'
workaround for buggy lexers
It seems that some lexers can be buggy when used together with git blame.
This results in a 500 error when a user tries to open the blame page in some cases.
The workaround is pretty simple. Not only fall back to plaintext when the file content can't be guessed, but also when the lexer fails.
This closes #1521 and #1646
/cc @DouweM @JobV It would be awesome to have this in a patch release for 7.11 or even in the release. But that's probably to late.
See merge request !683
Diffstat (limited to 'bin')
0 files changed, 0 insertions, 0 deletions