diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-14 12:13:33 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-14 12:13:33 +0000 |
| commit | 79a7da2537e94c34aba92ad4b9a5dc1da431b2c4 (patch) | |
| tree | 83b6a53a15a9266ca2e2aca061dd3f33d5282b1f /app/controllers/projects/blob_controller.rb | |
| parent | a58667ab4b4fc4b0d1e47e95d91c27ccadd0acd3 (diff) | |
| download | gitlab-ce-79a7da2537e94c34aba92ad4b9a5dc1da431b2c4.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 2b42dcb66ad..b30ef7506aa 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -99,7 +99,7 @@ class Projects::BlobController < Projects::ApplicationController @content = params[:content] @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 = diffy.diff.scan(/.*\n/)[2..] diff_lines = Gitlab::Diff::Parser.new.parse(diff_lines).to_a @diff_lines = Gitlab::Diff::Highlight.new(diff_lines, repository: @repository).highlight |