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/api/commits.rb | |
| 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/api/commits.rb')
| -rw-r--r-- | lib/api/commits.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/commits.rb b/lib/api/commits.rb index 6ad97f2deb2..62565e2d522 100644 --- a/lib/api/commits.rb +++ b/lib/api/commits.rb @@ -186,7 +186,7 @@ module API lines.each do |line| next unless line.new_pos == params[:line] && line.type == params[:line_type] - break opts[:line_code] = Gitlab::Git::Conflict::LineCode.generate(diff.new_path, line.new_pos, line.old_pos) + break opts[:line_code] = Gitlab::Git.diff_line_code(diff.new_path, line.new_pos, line.old_pos) end break if opts[:line_code] |