diff options
author | Heinrich Lee Yu <heinrich@gitlab.com> | 2019-02-06 14:11:33 +0800 |
---|---|---|
committer | Heinrich Lee Yu <heinrich@gitlab.com> | 2019-02-13 15:15:51 +0800 |
commit | a7b1a4ef1ef0b466423b89472c362341f3749cdc (patch) | |
tree | 15d6073bcb2d29c0cebbcce22daab919cfb1e854 /app | |
parent | 032e800b93dfe36604d896f2128ea05ad1330ece (diff) | |
download | gitlab-ce-a7b1a4ef1ef0b466423b89472c362341f3749cdc.tar.gz |
Fix polling for transformed individual notes30299-fix-polling-for-transformed-notes
Sets `updated_at` so that the transformed note is returned together with
the new reply
Diffstat (limited to 'app')
-rw-r--r-- | app/models/discussion.rb | 2 | ||||
-rw-r--r-- | app/models/individual_note_discussion.rb | 8 | ||||
-rw-r--r-- | app/services/notes/create_service.rb | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/app/models/discussion.rb b/app/models/discussion.rb index f2678e0597d..32529ebf71d 100644 --- a/app/models/discussion.rb +++ b/app/models/discussion.rb @@ -17,8 +17,6 @@ class Discussion :for_commit?, :for_merge_request?, - :save, - to: :first_note def project_id diff --git a/app/models/individual_note_discussion.rb b/app/models/individual_note_discussion.rb index aab0ff93468..b4a661ae5b4 100644 --- a/app/models/individual_note_discussion.rb +++ b/app/models/individual_note_discussion.rb @@ -17,8 +17,12 @@ class IndividualNoteDiscussion < Discussion noteable.supports_replying_to_individual_notes? && Feature.enabled?(:reply_to_individual_notes) end - def convert_to_discussion! - first_note.becomes!(Discussion.note_class).to_discussion + def convert_to_discussion!(save: false) + first_note.becomes!(Discussion.note_class).to_discussion.tap do + # Save needs to be called on first_note instead of the transformed note + # because of https://gitlab.com/gitlab-org/gitlab-ce/issues/57324 + first_note.save if save + end end def reply_attributes diff --git a/app/services/notes/create_service.rb b/app/services/notes/create_service.rb index b975c3a8cb6..5a6e7338b42 100644 --- a/app/services/notes/create_service.rb +++ b/app/services/notes/create_service.rb @@ -35,7 +35,7 @@ module Notes if !only_commands && note.save if note.part_of_discussion? && note.discussion.can_convert_to_discussion? - note.discussion.convert_to_discussion!.save(touch: false) + note.discussion.convert_to_discussion!(save: true) end todo_service.new_note(note, current_user) |