diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-28 11:58:59 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-28 11:58:59 +0400 |
| commit | b6454591ccaeced4c57562167be903308102a25d (patch) | |
| tree | 3b3cfc57580f2a51cb7969b3a381b654df612d1a /app/views/projects/snippets | |
| parent | 55a662e0c94d19cc09bcec7a2701252cfa1e1450 (diff) | |
| parent | 891ea6f6e66c753d9a2f7a4e261f4d37e118c253 (diff) | |
Merge branch 'highlight-js' into 'master'
Highlight.Js
Replace pygments code highlight with client-side library - highlight.js
http://highlightjs.org/
Diffstat (limited to 'app/views/projects/snippets')
| -rw-r--r-- | app/views/projects/snippets/_blob.html.haml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/views/projects/snippets/_blob.html.haml b/app/views/projects/snippets/_blob.html.haml index f14a2bd4ec0..088eb5c08ca 100644 --- a/app/views/projects/snippets/_blob.html.haml +++ b/app/views/projects/snippets/_blob.html.haml @@ -9,7 +9,6 @@ = link_to "raw", raw_project_snippet_path(@project, @snippet), class: "btn btn-tiny", target: "_blank" .file-content.code - unless @snippet.content.empty? - %div{class: user_color_scheme_class} - = raw @snippet.colorize(formatter: :gitlab) + = render 'shared/file_hljs', blob: @snippet - else %p.nothing_here_message Empty file |