summaryrefslogtreecommitdiff
path: root/app/views/search
diff options
context:
space:
mode:
authorStefan Tatschner <stefan@sevenbyte.org>2014-12-03 15:27:31 +0100
committerStefan Tatschner <stefan@sevenbyte.org>2015-01-15 13:41:11 +0100
commitbf079c24afb8ad2991a4eaf60a71a7bc45dd775d (patch)
treeed6317f84473ea68ef9444b0a2736f305f0a2b75 /app/views/search
parent377ae460056bb2a4e5824c4f7a3bbcb481e3e38b (diff)
downloadgitlab-ce-bf079c24afb8ad2991a4eaf60a71a7bc45dd775d.tar.gz
Replace highlight.js with rouge-fork rugments
I decided to create a fork of rouge as rouge lacks a HTML formatter with the required options such as wrapping a line with <span> tags. Furthermore I was not really convinced about the clarity of rouge's source code. Rugments 1.0.0beta3 for now only includes some basic linting and a new HTML formatter. Everything else should behave the same.
Diffstat (limited to 'app/views/search')
-rw-r--r--app/views/search/results/_blob.html.haml2
-rw-r--r--app/views/search/results/_wiki_blob.html.haml2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/search/results/_blob.html.haml b/app/views/search/results/_blob.html.haml
index b46b4832e19..dae641dab4f 100644
--- a/app/views/search/results/_blob.html.haml
+++ b/app/views/search/results/_blob.html.haml
@@ -6,4 +6,4 @@
%strong
= blob.filename
.file-content.code.term
- = render 'shared/file_hljs', blob: blob, first_line_number: blob.startline
+ = render 'shared/file_highlight', blob: blob, first_line_number: blob.startline, user_color_scheme_class: 'white'
diff --git a/app/views/search/results/_wiki_blob.html.haml b/app/views/search/results/_wiki_blob.html.haml
index e361074b6a0..c7bc596eb14 100644
--- a/app/views/search/results/_wiki_blob.html.haml
+++ b/app/views/search/results/_wiki_blob.html.haml
@@ -6,4 +6,4 @@
%strong
= wiki_blob.filename
.file-content.code.term
- = render 'shared/file_hljs', blob: wiki_blob, first_line_number: wiki_blob.startline
+ = render 'shared/file_highlight', blob: wiki_blob, first_line_number: wiki_blob.startline, user_color_scheme_class: 'white'