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
Boxiang Sun
gitlab-ce
Commits
4ae1591b
Commit
4ae1591b
authored
Dec 12, 2018
by
Sean Nichols
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move empty file message to diff_content component
parent
48d3fff0
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/assets/javascripts/diffs/components/diff_content.vue
app/assets/javascripts/diffs/components/diff_content.vue
+2
-1
app/assets/javascripts/diffs/components/diff_file.vue
app/assets/javascripts/diffs/components/diff_file.vue
+0
-1
No files found.
app/assets/javascripts/diffs/components/diff_content.vue
View file @
4ae1591b
...
@@ -69,7 +69,8 @@ export default {
...
@@ -69,7 +69,8 @@ export default {
<
template
>
<
template
>
<div
class=
"diff-content"
>
<div
class=
"diff-content"
>
<div
class=
"diff-viewer"
>
<div
class=
"diff-viewer"
>
<template
v-if=
"isTextFile"
>
<div
v-if=
"diffFile.empty"
class=
"nothing-here-block"
>
{{
__
(
'
Empty file
'
)
}}
</div>
<template
v-else-if=
"isTextFile"
>
<inline-diff-view
<inline-diff-view
v-if=
"isInlineView"
v-if=
"isInlineView"
:diff-file=
"diffFile"
:diff-file=
"diffFile"
...
...
app/assets/javascripts/diffs/components/diff_file.vue
View file @
4ae1591b
...
@@ -176,7 +176,6 @@ export default {
...
@@ -176,7 +176,6 @@ export default {
{{
__
(
'
This source diff could not be displayed because it is too large.
'
)
}}
{{
__
(
'
This source diff could not be displayed because it is too large.
'
)
}}
<span
v-html=
"viewBlobLink"
></span>
<span
v-html=
"viewBlobLink"
></span>
</div>
</div>
<div
v-if=
"file.empty"
class=
"nothing-here-block"
>
{{
__
(
'
Empty file
'
)
}}
</div>
</div>
</div>
</
template
>
</
template
>
...
...
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