Make diff discussion more reliable

95047f1d · Valery Sizov · c2173a14 · 95047f1d · 95047f1d
Commit 95047f1d authored Dec 30, 2016 by Valery Sizov
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 3 deletions

app/models/merge_request.rb app/models/merge_request.rb +5 -3

changelogs/unreleased/fix_broken_diff_discussions.yml changelogs/unreleased/fix_broken_diff_discussions.yml +4 -0

No files found.
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -861,9 +861,11 @@ class MergeRequest < ActiveRecord::Base
      paths: paths
    )

-    active_diff_notes.each do |note|
-      service.execute(note)
-      Gitlab::Timeless.timeless(note, &:save)
+    transaction do
+      active_diff_notes.each do |note|
+        service.execute(note)
+        Gitlab::Timeless.timeless(note, &:save)
+      end
    end
  end


--- a/changelogs/unreleased/fix_broken_diff_discussions.yml
+++ b/changelogs/unreleased/fix_broken_diff_discussions.yml
+---
+title: Make MR-review-discussions more reliable
+merge_request:
+author: