diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-08-03 15:32:00 -0700 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-08-03 15:32:00 -0700 |
| commit | 538e66d71c0f7125cc62ea51480668ba8b342544 (patch) | |
| tree | d27f667dbe404ce406e2ac6b3a901b87ff93da47 /spec/models/legacy_diff_note_spec.rb | |
| parent | 3ccb27c0c79ef92585a901de32339948319cf068 (diff) | |
| parent | 8890376f0f72f713a7530bd7989e71442c69dc91 (diff) | |
| download | gitlab-ce-538e66d71c0f7125cc62ea51480668ba8b342544.tar.gz | |
Merge branch 'master' into diff-line-comment-vuejs
# Conflicts:
# app/models/discussion.rb
# db/schema.rb
Diffstat (limited to 'spec/models/legacy_diff_note_spec.rb')
| -rw-r--r-- | spec/models/legacy_diff_note_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/legacy_diff_note_spec.rb b/spec/models/legacy_diff_note_spec.rb index d23fc06c3ad..c8ee656fe3b 100644 --- a/spec/models/legacy_diff_note_spec.rb +++ b/spec/models/legacy_diff_note_spec.rb @@ -58,7 +58,7 @@ describe LegacyDiffNote, models: true do # Generate a real line_code value so we know it will match. We use a # random line from a random diff just for funsies. - diff = merge.diffs.to_a.sample + diff = merge.raw_diffs.to_a.sample line = Gitlab::Diff::Parser.new.parse(diff.diff.each_line).to_a.sample code = Gitlab::Diff::LineCode.generate(diff.new_path, line.new_pos, line.old_pos) |