Commit 25670ee4 authored by Robert Speicher's avatar Robert Speicher Committed by Robert Speicher

Merge branch '18569-fix-diff-note-position' into 'master'

Restore old behavior around diff notes to outdated discussions

Fixes #18569

See merge request !4870
parent 115aa6f7
...@@ -26,6 +26,7 @@ v 8.9.1 (unreleased) ...@@ -26,6 +26,7 @@ v 8.9.1 (unreleased)
- Fix GitLab project import issues related to notes and builds. !4855 - Fix GitLab project import issues related to notes and builds. !4855
- Restrict header logo to 36px so it doesn't overflow. !4861 - Restrict header logo to 36px so it doesn't overflow. !4861
- Fix unwanted label unassignment. !4863 - 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 merge requests project settings help link anchor. !4873
- Fix 404 when accessing pipelines as guest user on public projects. !4881 - Fix 404 when accessing pipelines as guest user on public projects. !4881
......
...@@ -20,7 +20,7 @@ class LegacyDiffNote < Note ...@@ -20,7 +20,7 @@ class LegacyDiffNote < Note
end end
def discussion_id 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 end
def diff_file_hash def diff_file_hash
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment