Fix notes for commits inside MR being squashed in one discussion
This commit is contained in:
parent
64fb2c595a
commit
568ce1edd7
|
@ -71,7 +71,6 @@ class NotesController < ProjectResourceController
|
||||||
|
|
||||||
# Helps to distinguish e.g. commit notes in mr notes list
|
# Helps to distinguish e.g. commit notes in mr notes list
|
||||||
def note_for_main_target?(note)
|
def note_for_main_target?(note)
|
||||||
note.for_wall? ||
|
|
||||||
(@target_type.camelize == note.noteable_type && !note.for_diff_line?)
|
(@target_type.camelize == note.noteable_type && !note.for_diff_line?)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -88,7 +88,7 @@ class Note < ActiveRecord::Base
|
||||||
end
|
end
|
||||||
|
|
||||||
def discussion_id
|
def discussion_id
|
||||||
@discussion_id ||= [:discussion, noteable_type.try(:underscore), noteable_id, line_code].join("-").to_sym
|
@discussion_id ||= [:discussion, noteable_type.try(:underscore), noteable_id || commit_id, line_code].join("-").to_sym
|
||||||
end
|
end
|
||||||
|
|
||||||
# Returns true if this is a downvote note,
|
# Returns true if this is a downvote note,
|
||||||
|
|
Loading…
Reference in New Issue