diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-05-21 23:38:33 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-05-24 00:27:30 +0300 |
| commit | ab91f76e8b275d0fc1d78b38b95d4b2cd8e73bdb (patch) | |
| tree | e22910b5a3fc8dee98c5d674ee030b46421a4727 /app/services/merge_requests/refresh_service.rb | |
| parent | 52527be4387cb978402a330f2e4de96e586a62db (diff) | |
Add system note with link to diff comparison when MR discussion becomes outdated
Diffstat (limited to 'app/services/merge_requests/refresh_service.rb')
| -rw-r--r-- | app/services/merge_requests/refresh_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/merge_requests/refresh_service.rb b/app/services/merge_requests/refresh_service.rb index 1131d6f4913..81d217929d5 100644 --- a/app/services/merge_requests/refresh_service.rb +++ b/app/services/merge_requests/refresh_service.rb @@ -66,12 +66,12 @@ module MergeRequests filter_merge_requests(merge_requests).each do |merge_request| if merge_request.source_branch == @branch_name || force_push? - merge_request.reload_diff + merge_request.reload_diff(current_user) else mr_commit_ids = merge_request.commits_sha push_commit_ids = @commits.map(&:id) matches = mr_commit_ids & push_commit_ids - merge_request.reload_diff if matches.any? + merge_request.reload_diff(current_user) if matches.any? end merge_request.mark_as_unchecked |