Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42

1 files changed, 6 insertions, 0 deletions

diff --git a/lib/gitlab/diff/file_collection/base.rb b/lib/gitlab/diff/file_collection/base.rb
index 6d04c4874c7..f73e060be7f 100644
--- a/lib/gitlab/diff/file_collection/base.rb
+++ b/lib/gitlab/diff/file_collection/base.rb
@@ -43,10 +43,16 @@ module Gitlab
           end
         end
 
+        # This is either the new path, otherwise the old path for the diff_file
         def diff_file_paths
           diff_files.map(&:file_path)
         end
 
+        # This is both the new and old paths for the diff_file
+        def diff_paths
+          diff_files.map(&:paths).flatten.uniq
+        end
+
         def pagination_data
           @pagination_data || empty_pagination_data
         end