Commit ca622a3e authored by Filipa Lacerda's avatar Filipa Lacerda

Merge branch '59786-show-renamed-file-in-mr' into 'master'

Fix to show renamed file in mr

Closes #59786

See merge request gitlab-org/gitlab-ce!31888
parents 006bc124 261f4fe7
...@@ -130,7 +130,7 @@ export default { ...@@ -130,7 +130,7 @@ export default {
return `\`${this.diffFile.file_path}\``; return `\`${this.diffFile.file_path}\``;
}, },
isFileRenamed() { isFileRenamed() {
return this.diffFile.viewer.name === diffViewerModes.renamed; return this.diffFile.renamed_file;
}, },
isModeChanged() { isModeChanged() {
return this.diffFile.viewer.name === diffViewerModes.mode_changed; return this.diffFile.viewer.name === diffViewerModes.mode_changed;
......
---
title: Fix to show renamed file in mr
merge_request: 31888
author:
type: changed
...@@ -372,7 +372,7 @@ describe('diff_file_header', () => { ...@@ -372,7 +372,7 @@ describe('diff_file_header', () => {
}); });
it('displays old and new path if the file was renamed', () => { it('displays old and new path if the file was renamed', () => {
props.diffFile.viewer.name = diffViewerModes.renamed; props.diffFile.renamed_file = true;
vm = mountComponentWithStore(Component, { props, store }); vm = mountComponentWithStore(Component, { props, store });
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment