diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-20 12:10:26 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-20 12:10:26 +0000 |
| commit | a32e60a7ea976c65d0bcb8a9aed90e2b7ed56966 (patch) | |
| tree | b346e2fba71c7780c44dbb38a58eb52ba5d9b489 /app/controllers/projects/blob_controller.rb | |
| parent | b794758ce4c96fa13c4eefdb97f0852641604081 (diff) | |
| download | gitlab-ce-a32e60a7ea976c65d0bcb8a9aed90e2b7ed56966.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects/blob_controller.rb')
| -rw-r--r-- | app/controllers/projects/blob_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index dbe628cb43a..17af44672d9 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -92,7 +92,7 @@ class Projects::BlobController < Projects::ApplicationController @blob.load_all_data! diffy = Diffy::Diff.new(@blob.data, @content, diff: '-U 3', include_diff_info: true) diff_lines = diffy.diff.scan(/.*\n/)[2..-1] - diff_lines = Gitlab::Diff::Parser.new.parse(diff_lines) + diff_lines = Gitlab::Diff::Parser.new.parse(diff_lines).to_a @diff_lines = Gitlab::Diff::Highlight.new(diff_lines, repository: @repository).highlight render layout: false |