1 files changed, 2 insertions, 54 deletions
diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb
index 20a2443f523..e889b390968 100644
--- a/app/helpers/commits_helper.rb
+++ b/app/helpers/commits_helper.rb
@@ -15,61 +15,9 @@ module CommitsHelper
     commit_person_link(commit, options.merge(source: :committer))
   end
 
-  def identification_type(line)
-    if line[0] == "+"
-      "new"
-    elsif line[0] == "-"
-      "old"
-    else
-      nil
-    end
-  end
-
-  def build_line_anchor(diff, line_new, line_old)
-    "#{hexdigest(diff.new_path)}_#{line_old}_#{line_new}"
-  end
-
   def each_diff_line(diff, index)
-    diff_arr = diff.diff.lines.to_a
-
-    line_old = 1
-    line_new = 1
-    type = nil
-
-    lines_arr = ::Gitlab::InlineDiff.processing diff_arr
-    lines_arr.each do |line|
-      next if line.match(/^\-\-\- \/dev\/null/)
-      next if line.match(/^\+\+\+ \/dev\/null/)
-      next if line.match(/^\-\-\- a/)
-      next if line.match(/^\+\+\+ b/)
-
-      full_line = html_escape(line.gsub(/\n/, ''))
-      full_line = ::Gitlab::InlineDiff.replace_markers full_line
-
-      if line.match(/^@@ -/)
-        type = "match"
-
-        line_old = line.match(/\-[0-9]*/)[0].to_i.abs rescue 0
-        line_new = line.match(/\+[0-9]*/)[0].to_i.abs rescue 0
-
-        next if line_old == 1 && line_new == 1 #top of file
-        yield(full_line, type, nil, nil, nil)
-        next
-      else
-        type = identification_type(line)
-        line_code = build_line_anchor(diff, line_new, line_old)
-        yield(full_line, type, line_code, line_new, line_old)
-      end
-
-
-      if line[0] == "+"
-        line_new += 1
-      elsif line[0] == "-"
-        line_old += 1
-      else
-        line_new += 1
-        line_old += 1
-      end
+    Gitlab::DiffParser.new(diff).each do |full_line, type, line_code, line_new, line_old|
+      yield(full_line, type, line_code, line_new, line_old)
     end
   end