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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
905004fd
Commit
905004fd
authored
Oct 29, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #7980 from mr-vinn/diff-renames
Display renamed files in diff views
parents
a565c51b
0084b8a7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletion
+4
-1
app/views/projects/diffs/_file.html.haml
app/views/projects/diffs/_file.html.haml
+4
-1
No files found.
app/views/projects/diffs/_file.html.haml
View file @
905004fd
...
@@ -10,7 +10,10 @@
...
@@ -10,7 +10,10 @@
-
if
@commit
.
parent_ids
.
present?
-
if
@commit
.
parent_ids
.
present?
=
view_file_btn
(
@commit
.
parent_id
,
diff_file
,
project
)
=
view_file_btn
(
@commit
.
parent_id
,
diff_file
,
project
)
-
else
-
else
%span
=
diff_file
.
new_path
-
if
diff_file
.
renamed_file
%span
=
"
#{
diff_file
.
old_path
}
renamed to
#{
diff_file
.
new_path
}
"
-
else
%span
=
diff_file
.
new_path
-
if
diff_file
.
mode_changed?
-
if
diff_file
.
mode_changed?
%span
.file-mode
=
"
#{
diff_file
.
diff
.
a_mode
}
→
#{
diff_file
.
diff
.
b_mode
}
"
%span
.file-mode
=
"
#{
diff_file
.
diff
.
a_mode
}
→
#{
diff_file
.
diff
.
b_mode
}
"
...
...
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