Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
261f4fe7
Commit
261f4fe7
authored
Aug 21, 2019
by
Samantha Ming
Committed by
Filipa Lacerda
Aug 21, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix to show renamed file in mr
parent
006bc124
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
2 deletions
+7
-2
app/assets/javascripts/diffs/components/diff_file_header.vue
app/assets/javascripts/diffs/components/diff_file_header.vue
+1
-1
changelogs/unreleased/59786-show-renamed-file-in-mr.yml
changelogs/unreleased/59786-show-renamed-file-in-mr.yml
+5
-0
spec/javascripts/diffs/components/diff_file_header_spec.js
spec/javascripts/diffs/components/diff_file_header_spec.js
+1
-1
No files found.
app/assets/javascripts/diffs/components/diff_file_header.vue
View file @
261f4fe7
...
...
@@ -130,7 +130,7 @@ export default {
return
`\`
${
this
.
diffFile
.
file_path
}
\``
;
},
isFileRenamed
()
{
return
this
.
diffFile
.
viewer
.
name
===
diffViewerModes
.
renamed
;
return
this
.
diffFile
.
renamed_file
;
},
isModeChanged
()
{
return
this
.
diffFile
.
viewer
.
name
===
diffViewerModes
.
mode_changed
;
...
...
changelogs/unreleased/59786-show-renamed-file-in-mr.yml
0 → 100644
View file @
261f4fe7
---
title
:
Fix to show renamed file in mr
merge_request
:
31888
author
:
type
:
changed
spec/javascripts/diffs/components/diff_file_header_spec.js
View file @
261f4fe7
...
...
@@ -372,7 +372,7 @@ describe('diff_file_header', () => {
});
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
});
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment