diff options
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/models/legacy_diff_note.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 7e5bf35be5d..21c75953039 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -26,6 +26,7 @@ v 8.9.1 (unreleased) - Fix GitLab project import issues related to notes and builds. !4855 - Restrict header logo to 36px so it doesn't overflow. !4861 - Fix unwanted label unassignment. !4863 + - Restore old behavior around diff notes to outdated discussions. !4870 - Fix merge requests project settings help link anchor. !4873 - Fix 404 when accessing pipelines as guest user on public projects. !4881 diff --git a/app/models/legacy_diff_note.rb b/app/models/legacy_diff_note.rb index 95fd510eb3a..33d2a69ebaf 100644 --- a/app/models/legacy_diff_note.rb +++ b/app/models/legacy_diff_note.rb @@ -20,7 +20,7 @@ class LegacyDiffNote < Note end def discussion_id - @discussion_id ||= self.class.build_discussion_id(noteable_type, noteable_id || commit_id, line_code, active?) + @discussion_id ||= self.class.build_discussion_id(noteable_type, noteable_id || commit_id, line_code) end def diff_file_hash |