Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 insertions, 0 deletions

diff --git a/app/services/notes/quick_actions_service.rb b/app/services/notes/quick_actions_service.rb
index c670f01e502..36d9f1d7867 100644
--- a/app/services/notes/quick_actions_service.rb
+++ b/app/services/notes/quick_actions_service.rb
@@ -50,6 +50,11 @@ module Notes
       return if update_params.empty?
       return unless supported?(note)
 
+      # We need the `id` after the note is persisted
+      if update_params[:spend_time]
+        update_params[:spend_time][:note_id] = note.id
+      end
+
       self.class.noteable_update_service(note).new(note.resource_parent, current_user, update_params).execute(note.noteable)
     end
   end