Commit 448321a4 authored by Sean McGivern's avatar Sean McGivern

Merge branch 'fix_broken_diff_discussions' into 'master'

Make diff discussions more reliable

Closes #23646

See merge request !8378
parents 1138afe7 95047f1d
......@@ -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)
......
---
title: Make MR-review-discussions more reliable
merge_request:
author:
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment