diff options
| author | Alejandro RodrÃguez <alejorro70@gmail.com> | 2017-10-09 22:40:37 +0300 |
|---|---|---|
| committer | Alejandro RodrÃguez <alejorro70@gmail.com> | 2017-10-13 04:03:15 +0300 |
| commit | faa9bd402d3521b3f7b4cc2583f8ef1b3cceb821 (patch) | |
| tree | 550ca6c6907c1075d8c0a4092710c500dcf12329 /lib/gitlab/bitbucket_import | |
| parent | 3fcab51ebb0f3156b5d732d050b292cd3e081262 (diff) | |
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/bitbucket_import')
| -rw-r--r-- | lib/gitlab/bitbucket_import/importer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/bitbucket_import/importer.rb b/lib/gitlab/bitbucket_import/importer.rb index f613d8e8179..38ba5b97ed0 100644 --- a/lib/gitlab/bitbucket_import/importer.rb +++ b/lib/gitlab/bitbucket_import/importer.rb @@ -241,7 +241,7 @@ module Gitlab end def generate_line_code(pr_comment) - Gitlab::Git::DiffLineCode.generate(pr_comment.file_path, pr_comment.new_pos, pr_comment.old_pos) + Gitlab::Git::Conflict::LineCode.generate(pr_comment.file_path, pr_comment.new_pos, pr_comment.old_pos) end def pull_request_comment_attributes(comment) |