diff options
| author | Rubén Dávila <rdavila84@gmail.com> | 2016-01-07 21:08:57 -0500 |
|---|---|---|
| committer | Rubén Dávila <rdavila84@gmail.com> | 2016-01-07 21:08:57 -0500 |
| commit | f1f4fdf778245cab74ff9cda2a421315c21a99aa (patch) | |
| tree | 35d31fdb985e8fb5cd1b3e76261767b1cbcc95e9 /lib/gitlab/diff/parser.rb | |
| parent | 21958a393955037318141d39fbe14b1c2e842cab (diff) | |
| download | gitlab-ce-f1f4fdf778245cab74ff9cda2a421315c21a99aa.tar.gz | |
Don't process inline diffs on backend. #3945
Diffstat (limited to 'lib/gitlab/diff/parser.rb')
| -rw-r--r-- | lib/gitlab/diff/parser.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/gitlab/diff/parser.rb b/lib/gitlab/diff/parser.rb index 7015fe36c3d..177bad4b1cf 100644 --- a/lib/gitlab/diff/parser.rb +++ b/lib/gitlab/diff/parser.rb @@ -11,13 +11,10 @@ module Gitlab line_new = 1 type = nil - lines_arr = ::Gitlab::InlineDiff.processing lines - - lines_arr.each do |line| + @lines.each do |line| next if filename?(line) full_line = html_escape(line.gsub(/\n/, '')) - full_line = ::Gitlab::InlineDiff.replace_markers full_line if line.match(/^@@ -/) type = "match" |