diff options
| author | Alejandro RodrÃguez <alejorro70@gmail.com> | 2017-10-10 14:44:14 -0300 |
|---|---|---|
| committer | Alejandro RodrÃguez <alejorro70@gmail.com> | 2017-10-12 22:13:05 -0300 |
| commit | 9fdde3693b3b49e929b7c80ccbec4abe412edb7f (patch) | |
| tree | a0d6b1b4a21a2c2cc6d2322ecb410e08ef9103a4 /lib/gitlab/diff | |
| parent | faa9bd402d3521b3f7b4cc2583f8ef1b3cceb821 (diff) | |
| download | gitlab-ce-9fdde3693b3b49e929b7c80ccbec4abe412edb7f.tar.gz | |
Move line code generation into Gitlab::Gitconflict-resolution-refactor
Having a distinct class just for that was a bit overkill
Diffstat (limited to 'lib/gitlab/diff')
| -rw-r--r-- | lib/gitlab/diff/file.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/diff/file.rb b/lib/gitlab/diff/file.rb index 3f8d2041c29..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::Git::Conflict::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) |