diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-08 15:50:30 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-08 15:50:30 +0000 |
| commit | 9ea883fb5d02608010db858237cbd4926ae99650 (patch) | |
| tree | 253b730c6063de5882b5aea56444f12e03adad26 /app | |
| parent | b4972c4b237ad270ad1a4054c2fe2439d60ee06d (diff) | |
| parent | e6e29f9220a676f86ad035ae6430888deab4e8c5 (diff) | |
| download | gitlab-ce-9ea883fb5d02608010db858237cbd4926ae99650.tar.gz | |
Merge branch 'dm-highlight-diff-file-blob' into 'master'
Use Diff::File blob methods from diff highlighter
See merge request !11978
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/projects/blob_controller.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 4f53929a308..d8d14ea1fed 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -93,9 +93,11 @@ class Projects::BlobController < Projects::ApplicationController def diff apply_diff_view_cookie! - @form = UnfoldForm.new(params) - @lines = Gitlab::Highlight.highlight_lines(repository, @ref, @path) - @lines = @lines[@form.since - 1..@form.to - 1] + @blob.load_all_data! + @lines = Gitlab::Highlight.highlight(@blob.path, @blob.data, repository: @repository).lines + + @form = UnfoldForm.new(params) + @lines = @lines[@form.since - 1..@form.to - 1].map(&:html_safe) if @form.bottom? @match_line = '' |