diff options
| author | Phil Hughes <me@iamphill.com> | 2018-04-30 09:24:22 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-04-30 09:24:22 +0100 |
| commit | fd43419ace724f9c544579bef397cd0ddc2aa5ce (patch) | |
| tree | 913f5793b16c921cdf5e7c0b8c49ed4bca5611cd /app/assets/javascripts/ide/components/repo_file.vue | |
| parent | 1724594af9944310ff7b8b76cf75c0e0f76c0a77 (diff) | |
| parent | 87f1736a7381f39e373ce5bdae2d7185b9523108 (diff) | |
| download | gitlab-ce-fd43419ace724f9c544579bef397cd0ddc2aa5ce.tar.gz | |
Merge branch 'master' into ide-tree-changes-count
Diffstat (limited to 'app/assets/javascripts/ide/components/repo_file.vue')
| -rw-r--r-- | app/assets/javascripts/ide/components/repo_file.vue | 5 |
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 36ffc1b1b78..0b54d621fe9 100644 --- a/app/assets/javascripts/ide/components/repo_file.vue +++ b/app/assets/javascripts/ide/components/repo_file.vue @@ -99,7 +99,7 @@ export default { :file="file" /> </span> - <span class="pull-right"> + <span class="pull-right ide-file-icon-holder"> <mr-file-icon v-if="file.mrChange" /> @@ -119,7 +119,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 |