diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-08-04 01:32:00 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-08-04 01:32:00 +0300 |
| commit | 538e66d71c0f7125cc62ea51480668ba8b342544 (patch) | |
| tree | d27f667dbe404ce406e2ac6b3a901b87ff93da47 /app/models/legacy_diff_note.rb | |
| parent | 3ccb27c0c79ef92585a901de32339948319cf068 (diff) | |
| parent | 8890376f0f72f713a7530bd7989e71442c69dc91 (diff) | |
Merge branch 'master' into diff-line-comment-vuejs
# Conflicts:
# app/models/discussion.rb
# db/schema.rb
Diffstat (limited to 'app/models/legacy_diff_note.rb')
| -rw-r--r-- | app/models/legacy_diff_note.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/legacy_diff_note.rb b/app/models/legacy_diff_note.rb index bbb9f2346eb..f15553d706e 100644 --- a/app/models/legacy_diff_note.rb +++ b/app/models/legacy_diff_note.rb @@ -85,7 +85,7 @@ class LegacyDiffNote < Note return nil unless noteable return @diff if defined?(@diff) - @diff = noteable.diffs(Commit.max_diff_options).find do |d| + @diff = noteable.raw_diffs(Commit.max_diff_options).find do |d| d.new_path && Digest::SHA1.hexdigest(d.new_path) == diff_file_hash end end @@ -116,7 +116,7 @@ class LegacyDiffNote < Note # Find the diff on noteable that matches our own def find_noteable_diff - diffs = noteable.diffs(Commit.max_diff_options) + diffs = noteable.raw_diffs(Commit.max_diff_options) diffs.find { |d| d.new_path == self.diff.new_path } end end |