diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-01-22 01:43:06 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-01-22 01:47:17 +0100 |
| commit | 150b4f66e6a244b5f6bd1119de3ce68336a9bf9e (patch) | |
| tree | 5520435b90d8129c4013ae1d3d5e17a3f4c2d56a /app/controllers/projects/blob_controller.rb | |
| parent | 3f7993b5ceb9c5ba616dffef39f9b535482d92c1 (diff) | |
| download | gitlab-ce-unescaped-diffs.tar.gz | |
Make sure non-highlighted diffs are still escapedunescaped-diffs
Diffstat (limited to 'app/controllers/projects/blob_controller.rb')
| -rw-r--r-- | app/controllers/projects/blob_controller.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 8133de90a41..bb72232edd7 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -52,7 +52,9 @@ class Projects::BlobController < Projects::ApplicationController def preview @content = params[:content] diffy = Diffy::Diff.new(@blob.data, @content, diff: '-U 3', include_diff_info: true) - @diff_lines = Gitlab::Diff::Parser.new.parse(diffy.diff.scan(/.*\n/)) + diff_lines = diffy.diff.scan(/.*\n/)[2..-1] + diff_lines = Gitlab::Diff::Parser.new.parse(diff_lines) + @diff_lines = Gitlab::Diff::Highlight.new(diff_lines).highlight render layout: false end |