diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-02 00:10:20 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-02 00:10:20 +0300 |
| commit | cc77bdd6f5f12bea0f50064f3feadcd9c87009a6 (patch) | |
| tree | b9347c56663684eaa5939984c9a604dc767f214e /app/services/discussions | |
| parent | 9cf7b70ac7b17ea3310ebdf83e94d1d5fd248b82 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/discussions')
| -rw-r--r-- | app/services/discussions/capture_diff_note_positions_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/discussions/capture_diff_note_positions_service.rb b/app/services/discussions/capture_diff_note_positions_service.rb index 3684a3f679a..f9b31e0f2f1 100644 --- a/app/services/discussions/capture_diff_note_positions_service.rb +++ b/app/services/discussions/capture_diff_note_positions_service.rb @@ -26,7 +26,7 @@ module Discussions active_diff_discussions = merge_request.notes.new_diff_notes.discussions.select do |discussion| discussion.active?(merge_request.diff_refs) end - paths = active_diff_discussions.flat_map { |n| n.diff_file.paths } + paths = active_diff_discussions.flat_map { |n| n.diff_file&.paths } [active_diff_discussions, paths] end |