home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 18:16:45 +10:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Restore old behavior around diff notes to outdated discussions

Fixes #18569

See merge request !4870
This commit is contained in:
Robert Speicher
2016-06-23 18:20:00 -04:00
committed by Robert Speicher
parent 115aa6f75e
commit 25670ee440
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG
+1
View File
@@ -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
app/models/legacy_diff_note.rb
+1 -1
View File
@@ -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