diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-02-14 08:57:23 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-02-14 08:57:23 +0000 |
| commit | 6f357f74a6869e968a1ce1f10935dd9651bc6507 (patch) | |
| tree | 9e4c47b4e979c3b1a658958e72f3dcc9315d8721 | |
| parent | 9b0f0fd834b5e74da8d29941d5158978cf8f3801 (diff) | |
| parent | 2ecac881e728433fa54282ef6e20f0570f5ddc7e (diff) | |
| download | gitlab-ce-6f357f74a6869e968a1ce1f10935dd9651bc6507.tar.gz | |
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
| -rw-r--r-- | app/helpers/diff_helper.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/42314-diff-file.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/helpers/diff_helper.rb b/app/helpers/diff_helper.rb index 0f5fc2823a3..b5ca39711bc 100644 --- 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" diff --git a/changelogs/unreleased/42314-diff-file.yml b/changelogs/unreleased/42314-diff-file.yml new file mode 100644 index 00000000000..1eed5ef1a34 --- /dev/null +++ b/changelogs/unreleased/42314-diff-file.yml @@ -0,0 +1,5 @@ +--- +title: Render modified icon for moved file in changes dropdown +merge_request: +author: +type: fixed |