diff options
| author | Alejandro RodrÃguez <alejorro70@gmail.com> | 2017-10-06 19:42:56 -0300 |
|---|---|---|
| committer | Alejandro RodrÃguez <alejorro70@gmail.com> | 2017-10-12 21:45:16 -0300 |
| commit | f72598b659871a3d4e8ef1905918067522ba2a29 (patch) | |
| tree | 97e3c6d8311c134a0df4ffa5023b4e43aea45012 /lib/gitlab/conflict | |
| parent | 9fda629a347cb43d8f5871f101192187fcdeeea2 (diff) | |
| download | gitlab-ce-f72598b659871a3d4e8ef1905918067522ba2a29.tar.gz | |
Move Gitlab::Diff::LineCode to module Gitlab::Git
Diffstat (limited to 'lib/gitlab/conflict')
| -rw-r--r-- | lib/gitlab/conflict/file.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/conflict/file.rb b/lib/gitlab/conflict/file.rb index 98dfe900044..52f8fe27f3b 100644 --- a/lib/gitlab/conflict/file.rb +++ b/lib/gitlab/conflict/file.rb @@ -163,7 +163,7 @@ module Gitlab end def line_code(line) - Gitlab::Diff::LineCode.generate(our_path, line.new_pos, line.old_pos) + Gitlab::Git::DiffLineCode.generate(our_path, line.new_pos, line.old_pos) end def create_match_line(line) |