diff options
author | Phil Hughes <me@iamphill.com> | 2018-04-03 11:10:01 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-04-03 11:10:01 +0100 |
commit | 49f198e6c142c0bf6983187b164599388cd67197 (patch) | |
tree | f103b1914c092480af36c200ca75813d6b132434 /app/assets/javascripts/ide/components/repo_file.vue | |
parent | d6dd2f5f70685e35cf6d0f2738059fe44e1054a3 (diff) | |
parent | 8dca091ff7f04bb92a7835ebeff783b7f0ef76cd (diff) | |
download | gitlab-ce-49f198e6c142c0bf6983187b164599388cd67197.tar.gz |
Merge branch 'master' into ide-staged-changes
Diffstat (limited to 'app/assets/javascripts/ide/components/repo_file.vue')
-rw-r--r-- | app/assets/javascripts/ide/components/repo_file.vue | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/app/assets/javascripts/ide/components/repo_file.vue b/app/assets/javascripts/ide/components/repo_file.vue index 9a7c83ea7b9..fab53592e4e 100644 --- a/app/assets/javascripts/ide/components/repo_file.vue +++ b/app/assets/javascripts/ide/components/repo_file.vue @@ -6,6 +6,7 @@ import router from '../ide_router'; import newDropdown from './new_dropdown/index.vue'; import fileStatusIcon from './repo_file_status_icon.vue'; import changedFileIcon from './changed_file_icon.vue'; +import mrFileIcon from './mr_file_icon.vue'; export default { name: 'RepoFile', @@ -15,6 +16,7 @@ export default { fileStatusIcon, fileIcon, changedFileIcon, + mrFileIcon, }, props: { file: { @@ -56,10 +58,7 @@ export default { ...mapActions(['toggleTreeOpen', 'updateDelayViewerUpdated']), clickFile() { // Manual Action if a tree is selected/opened - if ( - this.isTree && - this.$router.currentRoute.path === `/project${this.file.url}` - ) { + if (this.isTree && this.$router.currentRoute.path === `/project${this.file.url}`) { this.toggleTreeOpen(this.file.path); } @@ -102,12 +101,17 @@ export default { :file="file" /> </span> - <changed-file-icon - v-if="file.changed || file.tempFile || file.staged" - :file="file" - :show-tooltip="true" - class="prepend-top-5 pull-right" - /> + <span class="pull-right"> + <mr-file-icon + v-if="file.mrChange" + /> + <changed-file-icon + v-if="file.changed || file.tempFile || file.staged" + :file="file" + :show-tooltip="true" + class="prepend-top-5 pull-right" + /> + </span> <new-dropdown v-if="isTree" :project-id="file.projectId" |