summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/ide/components/repo_file.vue
diff options
context:
space:
mode:
authorClement Ho <ClemMakesApps@gmail.com>2018-04-26 15:55:32 -0500
committerClement Ho <ClemMakesApps@gmail.com>2018-04-26 15:55:32 -0500
commit9cc1294d27d09015bcd1dc73dab187a0f605e22a (patch)
tree139fd8f861ff0d9b4f748144a69418ac2d0b730c /app/assets/javascripts/ide/components/repo_file.vue
parent112b977ed3ca47aacbc0412b39adb8882e18839f (diff)
parentc73b5d31e680b175b2592d299c901bdcb43bca9f (diff)
downloadgitlab-ce-9cc1294d27d09015bcd1dc73dab187a0f605e22a.tar.gz
Merge branch 'master' into bootstrap4
Diffstat (limited to 'app/assets/javascripts/ide/components/repo_file.vue')
-rw-r--r--app/assets/javascripts/ide/components/repo_file.vue5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/javascripts/ide/components/repo_file.vue b/app/assets/javascripts/ide/components/repo_file.vue
index ec4ce14e5b4..8829ba5962f 100644
--- a/app/assets/javascripts/ide/components/repo_file.vue
+++ b/app/assets/javascripts/ide/components/repo_file.vue
@@ -97,7 +97,7 @@ export default {
:file="file"
/>
</span>
- <span class="float-right">
+ <span class="float-right ide-file-icon-holder">
<mr-file-icon
v-if="file.mrChange"
/>
@@ -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