diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-05-25 22:15:57 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-05-25 22:15:57 +0000 |
| commit | 8e2fefc6c44fc3c6140e5cbc4b56c58c90dc07f3 (patch) | |
| tree | 2fe8ce678f1183fe778454dfa39e3dcc277d3fd8 /app/models/diff_note.rb | |
| parent | e20eb71203aa29458d7f51a27d42a3d8208e2494 (diff) | |
| parent | d88a5c1db1c6cca639039188a26c6e6d5bc68831 (diff) | |
| download | gitlab-ce-8e2fefc6c44fc3c6140e5cbc4b56c58c90dc07f3.tar.gz | |
Merge branch 'dm-diff-cleanup' into 'master'
Clean up diff rendering
See merge request !11390
Diffstat (limited to 'app/models/diff_note.rb')
| -rw-r--r-- | app/models/diff_note.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/diff_note.rb b/app/models/diff_note.rb index 1764004078e..2a4cff37566 100644 --- a/app/models/diff_note.rb +++ b/app/models/diff_note.rb @@ -63,7 +63,7 @@ class DiffNote < Note return false unless supported? return true if for_commit? - diff_refs ||= noteable_diff_refs + diff_refs ||= noteable.diff_refs self.position.diff_refs == diff_refs end @@ -99,7 +99,7 @@ class DiffNote < Note self.project, nil, old_diff_refs: self.position.diff_refs, - new_diff_refs: noteable_diff_refs, + new_diff_refs: noteable.diff_refs, paths: self.position.paths ).execute(self) end |