diff options
| author | Job van der Voort <jobvandervoort@gmail.com> | 2015-05-21 10:38:22 +0200 |
|---|---|---|
| committer | Job van der Voort <jobvandervoort@gmail.com> | 2015-05-21 10:38:22 +0200 |
| commit | 3a3f4b41e67485e62b2e37cc395f3407b30a7d9e (patch) | |
| tree | 2af95de20055ae6efb95ecb21976e5e534162e63 /app/helpers | |
| parent | 90b1019ab42985568025c26164dad869677e3e1d (diff) | |
| parent | 10620c5986dea30d6a2c9c5d7dcd15244bddec8e (diff) | |
| download | gitlab-ce-3a3f4b41e67485e62b2e37cc395f3407b30a7d9e.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/blob_helper.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/helpers/blob_helper.rb b/app/helpers/blob_helper.rb index 885ac5f85b8..9fe5f82f02f 100644 --- a/app/helpers/blob_helper.rb +++ b/app/helpers/blob_helper.rb @@ -9,11 +9,13 @@ module BlobHelper begin lexer = Rugments::Lexer.guess(filename: blob_name, source: blob_content) - rescue Rugments::Lexer::AmbiguousGuess + result = formatter.format(lexer.lex(blob_content)).html_safe + rescue lexer = Rugments::Lexers::PlainText + result = formatter.format(lexer.lex(blob_content)).html_safe end - formatter.format(lexer.lex(blob_content)).html_safe + result end def no_highlight_files |