diff options
Diffstat (limited to 'app/services/merge_requests/mergeability_check_service.rb')
| -rw-r--r-- | app/services/merge_requests/mergeability_check_service.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/app/services/merge_requests/mergeability_check_service.rb b/app/services/merge_requests/mergeability_check_service.rb index 5b79e4d01f2..d3d661a3b75 100644 --- a/app/services/merge_requests/mergeability_check_service.rb +++ b/app/services/merge_requests/mergeability_check_service.rb @@ -118,11 +118,18 @@ module MergeRequests if can_git_merge? && merge_to_ref merge_request.mark_as_mergeable + update_diff_discussion_positions! else merge_request.mark_as_unmergeable end end + def update_diff_discussion_positions! + return if Feature.disabled?(:merge_ref_head_comments, merge_request.target_project) + + Discussions::CaptureDiffNotePositionsService.new(merge_request).execute + end + def recheck! if !merge_request.recheck_merge_status? && outdated_merge_ref? merge_request.mark_as_unchecked |