Merge branch '42314-diff-file' into 'master'

Resolve "Diff file navigation shows renamed files as deleted"

Closes #42314

See merge request gitlab-org/gitlab-ce!17091

app/helpers/diff_helper.rb

@@ -160,7 +160,7 @@ module DiffHelper
   end
 
   def diff_file_changed_icon(diff_file)
-    if diff_file.deleted_file? || diff_file.renamed_file?
+    if diff_file.deleted_file?
       "file-deletion"
     elsif diff_file.new_file?
       "file-addition"

changelogs/unreleased/42314-diff-file.yml

+---
+title: Render modified icon for moved file in changes dropdown
+merge_request:
+author:
+type: fixed