diff options
| author | Sean McGivern <sean@gitlab.com> | 2017-09-05 16:49:05 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2017-09-06 10:08:03 +0100 |
| commit | e8f29569bcb4a2d732a2c00b34958f58d5622836 (patch) | |
| tree | 41b69a559246c423699c741d2f9f252911a2e525 /app/models/merge_request.rb | |
| parent | ac816d90d4cc116117497479f400211a43db6be1 (diff) | |
| download | gitlab-ce-e8f29569bcb4a2d732a2c00b34958f58d5622836.tar.gz | |
Resolve outdated diff discussions on push
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 724fb4ccef1..b82f49d7073 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -918,6 +918,12 @@ class MergeRequest < ActiveRecord::Base active_diff_discussions.each do |discussion| service.execute(discussion) end + + if project.resolve_outdated_diff_discussions? + MergeRequests::ResolvedDiscussionNotificationService + .new(project, current_user) + .execute(self) + end end def keep_around_commit |