diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-10-16 13:36:06 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-10-16 13:36:06 +0300 |
| commit | b2553840e88bed82bad45712e2696de83fac1230 (patch) | |
| tree | 0218a658d703f7fe09a67e5d82058c608cb55073 /lib/gitlab/diff | |
| parent | 3a7623fc010832c337e0ba0eb8650d7f6fca3562 (diff) | |
| parent | 9fdde3693b3b49e929b7c80ccbec4abe412edb7f (diff) | |
Merge branch 'conflict-resolution-refactor' into 'master'
Conflict resolution refactor
See merge request gitlab-org/gitlab-ce!14747
Diffstat (limited to 'lib/gitlab/diff')
| -rw-r--r-- | lib/gitlab/diff/file.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/diff/line_code.rb | 9 |
2 files changed, 1 insertions, 10 deletions
diff --git a/lib/gitlab/diff/file.rb b/lib/gitlab/diff/file.rb index 599c3c5deab..ea5891a028a 100644 --- a/lib/gitlab/diff/file.rb +++ b/lib/gitlab/diff/file.rb @@ -49,7 +49,7 @@ module Gitlab def line_code(line) return if line.meta? - Gitlab::Diff::LineCode.generate(file_path, line.new_pos, line.old_pos) + Gitlab::Git.diff_line_code(file_path, line.new_pos, line.old_pos) end def line_for_line_code(code) diff --git a/lib/gitlab/diff/line_code.rb b/lib/gitlab/diff/line_code.rb deleted file mode 100644 index f3578ab3d35..00000000000 --- a/lib/gitlab/diff/line_code.rb +++ /dev/null @@ -1,9 +0,0 @@ -module Gitlab - module Diff - class LineCode - def self.generate(file_path, new_line_position, old_line_position) - "#{Digest::SHA1.hexdigest(file_path)}_#{old_line_position}_#{new_line_position}" - end - end - end -end |