diff options
| author | Mark Chao <mchao@gitlab.com> | 2018-09-06 12:34:25 +0800 |
|---|---|---|
| committer | Mark Chao <mchao@gitlab.com> | 2018-10-30 15:44:55 +0800 |
| commit | 39ae9a59a59615092fbef189466f37c34f4a7fb1 (patch) | |
| tree | c8611265f8fb290cbce92f04cadb593b531165ee /app/views/projects/blob | |
| parent | 32f9cf8ce3dd337bf3b1683c5872171c253f0d27 (diff) | |
| download | gitlab-ce-39ae9a59a59615092fbef189466f37c34f4a7fb1.tar.gz | |
Make Highlight accept language param
This replaces the repository param.
This allows more flexiblity as sometimes we have highlight content
not related to repository. Sometimes we know ahead of time the language
of the content. Lastly language determination seems better fit as a
logic in the Blob class.
`repository` param is only used to determine the language, which seems
to be the responsiblity of Blob.
Diffstat (limited to 'app/views/projects/blob')
| -rw-r--r-- | app/views/projects/blob/viewers/_highlight_embed.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/blob/viewers/_text.html.haml | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/views/projects/blob/viewers/_highlight_embed.html.haml b/app/views/projects/blob/viewers/_highlight_embed.html.haml index 9bd4ef6ad0b..6a631fef1a9 100644 --- a/app/views/projects/blob/viewers/_highlight_embed.html.haml +++ b/app/views/projects/blob/viewers/_highlight_embed.html.haml @@ -4,4 +4,6 @@ - blob.data.each_line.each_with_index do |_, index| %span.diff-line-num= index + 1 .blob-content{ data: { blob_id: blob.id } } - = highlight(blob.path, blob.data, repository: nil, plain: blob.no_highlighting?) + %pre.code.highlight + %code + = blob.present.highlight diff --git a/app/views/projects/blob/viewers/_text.html.haml b/app/views/projects/blob/viewers/_text.html.haml index a91df321ca0..26ad23da436 100644 --- a/app/views/projects/blob/viewers/_text.html.haml +++ b/app/views/projects/blob/viewers/_text.html.haml @@ -1 +1 @@ -= render 'shared/file_highlight', blob: viewer.blob, repository: @repository += render 'shared/file_highlight', blob: viewer.blob |