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
10bba038
Commit
10bba038
authored
Apr 25, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
force modified icon in tree list & tab bar
parent
e1a701c7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
2 deletions
+11
-2
app/assets/javascripts/ide/components/changed_file_icon.vue
app/assets/javascripts/ide/components/changed_file_icon.vue
+8
-1
app/assets/javascripts/ide/components/repo_file.vue
app/assets/javascripts/ide/components/repo_file.vue
+2
-1
app/assets/javascripts/ide/components/repo_tab.vue
app/assets/javascripts/ide/components/repo_tab.vue
+1
-0
No files found.
app/assets/javascripts/ide/components/changed_file_icon.vue
View file @
10bba038
...
...
@@ -26,11 +26,18 @@ export default {
required
:
false
,
default
:
false
,
},
forceModifiedIcon
:
{
type
:
Boolean
,
required
:
false
,
default
:
false
,
},
},
computed
:
{
changedIcon
()
{
const
suffix
=
this
.
file
.
staged
&&
!
this
.
showStagedIcon
?
'
-solid
'
:
''
;
return
this
.
file
.
tempFile
?
`file-addition
${
suffix
}
`
:
`file-modified
${
suffix
}
`
;
return
this
.
file
.
tempFile
&&
!
this
.
forceModifiedIcon
?
`file-addition
${
suffix
}
`
:
`file-modified
${
suffix
}
`
;
},
stagedIcon
()
{
return
`
${
this
.
changedIcon
}
-solid`
;
...
...
app/assets/javascripts/ide/components/repo_file.vue
View file @
10bba038
...
...
@@ -106,7 +106,8 @@ export default {
:file=
"file"
:show-tooltip=
"true"
:show-staged-icon=
"true"
class=
"prepend-top-5 pull-right"
:force-modified-icon=
"true"
class=
"pull-right"
/>
</span>
<new-dropdown
...
...
app/assets/javascripts/ide/components/repo_tab.vue
View file @
10bba038
...
...
@@ -84,6 +84,7 @@ export default {
<changed-file-icon
v-else
:file=
"tab"
:force-modified-icon=
"true"
/>
</button>
...
...
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