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

Merge branch '42314-diff-file' into 'master'
6f357f74 · Douwe Maan · 9b0f0fd8 · 2ecac881 · 6f357f74 · 6f357f74
Commit 6f357f74 authored Feb 14, 2018 by Douwe Maan
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

diff_helper.rb app/helpers/diff_helper.rb +1 -1

42314-diff-file.yml changelogs/unreleased/42314-diff-file.yml +5 -0

No files found.
--- a/app/helpers/diff_helper.rb
+++ b/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"

--- a/changelogs/unreleased/42314-diff-file.yml
+++ b/changelogs/unreleased/42314-diff-file.yml
+---
+title: Render modified icon for moved file in changes dropdown
+merge_request:
+author:
+type: fixed