diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-01-25 09:54:34 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-01-25 09:54:34 +0000 |
| commit | 448321a46e163ccd2dee38109901fca9d2a65537 (patch) | |
| tree | cc22b123c7334256e35a7f6efb1f1fa0ebc10c55 | |
| parent | 1138afe7c0c0ae2b80b5282aff42e6399328eea8 (diff) | |
| parent | 95047f1dc7109ea7e5ebead4115ec01bb8a75ba3 (diff) | |
| download | gitlab-ce-448321a46e163ccd2dee38109901fca9d2a65537.tar.gz | |
Merge branch 'fix_broken_diff_discussions' into 'master'
Make diff discussions more reliable
Closes #23646
See merge request !8378
| -rw-r--r-- | app/models/merge_request.rb | 8 | ||||
| -rw-r--r-- | changelogs/unreleased/fix_broken_diff_discussions.yml | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index cd5b345bae5..6753504acff 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -865,9 +865,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 diff --git a/changelogs/unreleased/fix_broken_diff_discussions.yml b/changelogs/unreleased/fix_broken_diff_discussions.yml new file mode 100644 index 00000000000..4551212759f --- /dev/null +++ b/changelogs/unreleased/fix_broken_diff_discussions.yml @@ -0,0 +1,4 @@ +--- +title: Make MR-review-discussions more reliable +merge_request: +author: |