diff options
| author | Alejandro RodrÃguez <alejorro70@gmail.com> | 2017-10-09 16:40:37 -0300 |
|---|---|---|
| committer | Alejandro RodrÃguez <alejorro70@gmail.com> | 2017-10-12 22:03:15 -0300 |
| commit | faa9bd402d3521b3f7b4cc2583f8ef1b3cceb821 (patch) | |
| tree | 550ca6c6907c1075d8c0a4092710c500dcf12329 /lib/api/commits.rb | |
| parent | 3fcab51ebb0f3156b5d732d050b292cd3e081262 (diff) | |
| download | gitlab-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/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 e2d50b4e0a6..6ad97f2deb2 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::DiffLineCode.generate(diff.new_path, line.new_pos, line.old_pos) + break opts[:line_code] = Gitlab::Git::Conflict::LineCode.generate(diff.new_path, line.new_pos, line.old_pos) end break if opts[:line_code] |