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 /spec/models/diff_note_spec.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 'spec/models/diff_note_spec.rb')
| -rw-r--r-- | spec/models/diff_note_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/diff_note_spec.rb b/spec/models/diff_note_spec.rb index 67a8efa6524..9db8a61e9ca 100644 --- a/spec/models/diff_note_spec.rb +++ b/spec/models/diff_note_spec.rb @@ -105,7 +105,7 @@ describe DiffNote do describe "#line_code" do it "returns the correct line code" do - line_code = Gitlab::Git::DiffLineCode.generate(position.file_path, position.formatter.new_line, 15) + line_code = Gitlab::Git::Conflict::LineCode.generate(position.file_path, position.formatter.new_line, 15) expect(subject.line_code).to eq(line_code) end |