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/gitlab/git/conflict/line_code.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/gitlab/git/conflict/line_code.rb')
| -rw-r--r-- | lib/gitlab/git/conflict/line_code.rb | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/lib/gitlab/git/conflict/line_code.rb b/lib/gitlab/git/conflict/line_code.rb new file mode 100644 index 00000000000..bdbb4c9cb83 --- /dev/null +++ b/lib/gitlab/git/conflict/line_code.rb @@ -0,0 +1,11 @@ +module Gitlab + module Git + module Conflict + class LineCode + def self.generate(file_path, new_line_position, old_line_position) + "#{Digest::SHA1.hexdigest(file_path)}_#{old_line_position}_#{new_line_position}" + end + end + end + end +end |