From e8f29569bcb4a2d732a2c00b34958f58d5622836 Mon Sep 17 00:00:00 2001 From: Sean McGivern Date: Tue, 5 Sep 2017 16:49:05 +0100 Subject: Resolve outdated diff discussions on push --- app/services/discussions/update_diff_position_service.rb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'app/services/discussions') diff --git a/app/services/discussions/update_diff_position_service.rb b/app/services/discussions/update_diff_position_service.rb index 1ef8d9edbe1..746f209e20f 100644 --- a/app/services/discussions/update_diff_position_service.rb +++ b/app/services/discussions/update_diff_position_service.rb @@ -10,6 +10,10 @@ module Discussions discussion.notes.each do |note| if outdated note.change_position = position + + if project.resolve_outdated_diff_discussions? + note.resolve_without_save(current_user, resolved_by_push: true) + end else note.position = position note.change_position = nil -- cgit v1.2.3