diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-02-13 18:11:26 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-02-13 18:12:19 +0000 |
| commit | 2ecac881e728433fa54282ef6e20f0570f5ddc7e (patch) | |
| tree | 8b4cd8e764d4bf77a3aa349a8618bfdff0134cfb | |
| parent | 4e846c735f8ec7e24e61454b0506b839a8f0ff3f (diff) | |
| download | gitlab-ce-42314-diff-file.tar.gz | |
Render modified icon for moved file42314-diff-file
| -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 |