summaryrefslogtreecommitdiff
path: root/lib/gitlab/diff/file.rb
diff options
context:
space:
mode:
authorAlejandro Rodríguez <alejorro70@gmail.com>2017-10-09 16:40:37 -0300
committerAlejandro Rodríguez <alejorro70@gmail.com>2017-10-12 22:03:15 -0300
commitfaa9bd402d3521b3f7b4cc2583f8ef1b3cceb821 (patch)
tree550ca6c6907c1075d8c0a4092710c500dcf12329 /lib/gitlab/diff/file.rb
parent3fcab51ebb0f3156b5d732d050b292cd3e081262 (diff)
downloadgitlab-ce-faa9bd402d3521b3f7b4cc2583f8ef1b3cceb821.tar.gz
Create a Gitlab::Git submodule for conlict-related files
Rename classes to (hopefully) clearer names while we're doing that.
Diffstat (limited to 'lib/gitlab/diff/file.rb')
-rw-r--r--lib/gitlab/diff/file.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/diff/file.rb b/lib/gitlab/diff/file.rb
index bc2c25c9cb6..3f8d2041c29 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::DiffLineCode.generate(file_path, line.new_pos, line.old_pos)
+ Gitlab::Git::Conflict::LineCode.generate(file_path, line.new_pos, line.old_pos)
end
def line_for_line_code(code)