diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-07-16 01:56:05 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-07-16 01:56:05 +0000 |
| commit | 9b597fb5c1bb322416aadf9c1a41f26d7c08e10f (patch) | |
| tree | ab820ba0ea8d7bd729af55401cf9bdf263885d2f /lib/api/helpers.rb | |
| parent | 4f25e3178b2eaa71f312e80ca183358b350c97d6 (diff) | |
| parent | 82959349dd97450a166d42547083f8dfd3d1491e (diff) | |
| download | gitlab-ce-9b597fb5c1bb322416aadf9c1a41f26d7c08e10f.tar.gz | |
Merge branch 'syntax-highlight-unknown-language' into 'master'
Don't fail to highlight when Rouge doesn't have a lexer
Fixes issue introduced by upgrade to Rouge 2.0 (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4691)
See merge request !5291
Diffstat (limited to 'lib/api/helpers.rb')
0 files changed, 0 insertions, 0 deletions