Merge branch 'fix_broken_diff_discussions' into 'master'

Make diff discussions more reliable

Closes #23646

See merge request !8378

app/models/merge_request.rb

@@ -865,11 +865,13 @@ class MergeRequest < ActiveRecord::Base
       paths: paths
     )
 
+    transaction do
       active_diff_notes.each do |note|
         service.execute(note)
         Gitlab::Timeless.timeless(note, &:save)
       end
     end
+  end
 
   def keep_around_commit
     project.repository.keep_around(self.merge_commit_sha)

changelogs/unreleased/fix_broken_diff_discussions.yml

+---
+title: Make MR-review-discussions more reliable
+merge_request:
+author: