diff options
| author | Rubén Dávila <rdavila84@gmail.com> | 2016-01-07 22:37:01 -0500 |
|---|---|---|
| committer | Rubén Dávila <rdavila84@gmail.com> | 2016-01-07 22:37:01 -0500 |
| commit | 21b602c60ad787b63039d804a5e15b43d0d3c32c (patch) | |
| tree | 91a068f9360b295c14599dd6547972c416a3614d /app/controllers/projects/blob_controller.rb | |
| parent | f1f4fdf778245cab74ff9cda2a421315c21a99aa (diff) | |
| download | gitlab-ce-21b602c60ad787b63039d804a5e15b43d0d3c32c.tar.gz | |
Change strategy to highlight diffs. #3945
Now we apply syntax highlighting to the whole old and new files.
This basically help us to highlight adequately multiline content.
Diffstat (limited to 'app/controllers/projects/blob_controller.rb')
| -rw-r--r-- | app/controllers/projects/blob_controller.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index d22c7b550b0..6aa602321f4 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -65,8 +65,11 @@ class Projects::BlobController < Projects::ApplicationController end def diff - @form = UnfoldForm.new(params) - @lines = Gitlab::Diff::Highlight.process_diff_lines(@blob.name, @blob.data.lines[@form.since - 1..@form.to - 1]) + ref, file_name = params[:id].split('/', 2) + + @form = UnfoldForm.new(params) + @lines = Gitlab::Diff::Highlight.process_file(repository, ref, file_name) + @lines = @lines[@form.since - 1..@form.to - 1] if @form.bottom? @match_line = '' |