Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlejandro Rodríguez <alejorro70@gmail.com>2017-10-10 20:44:14 +0300
committerAlejandro Rodríguez <alejorro70@gmail.com>2017-10-13 04:13:05 +0300
commit9fdde3693b3b49e929b7c80ccbec4abe412edb7f (patch)
treea0d6b1b4a21a2c2cc6d2322ecb410e08ef9103a4 /spec/models/diff_note_spec.rb
parentfaa9bd402d3521b3f7b4cc2583f8ef1b3cceb821 (diff)
Move line code generation into Gitlab::Git
Having a distinct class just for that was a bit overkill
Diffstat (limited to 'spec/models/diff_note_spec.rb')
-rw-r--r--spec/models/diff_note_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/diff_note_spec.rb b/spec/models/diff_note_spec.rb
index 9db8a61e9ca..da972d2d86a 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::Conflict::LineCode.generate(position.file_path, position.formatter.new_line, 15)
+ line_code = Gitlab::Git.diff_line_code(position.file_path, position.formatter.new_line, 15)
expect(subject.line_code).to eq(line_code)
end