diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2018-03-27 16:56:22 +0200 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-03-28 12:17:30 +0200 |
| commit | 4afd72377d0ad5fcc8dc5462cc3b80432f3ac79e (patch) | |
| tree | 627c6b436379cb804e093ec1bf06004643ff2840 /app/assets/javascripts/ide/components/changed_file_icon.vue | |
| parent | d9b7c33f779270dd8bb9fae3b452eca3d5a60d98 (diff) | |
| download | gitlab-ce-4afd72377d0ad5fcc8dc5462cc3b80432f3ac79e.tar.gz | |
Added Changes based on UX Review
Diffstat (limited to 'app/assets/javascripts/ide/components/changed_file_icon.vue')
| -rw-r--r-- | app/assets/javascripts/ide/components/changed_file_icon.vue | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/assets/javascripts/ide/components/changed_file_icon.vue b/app/assets/javascripts/ide/components/changed_file_icon.vue index 0e03f527227..037e3efb4ce 100644 --- a/app/assets/javascripts/ide/components/changed_file_icon.vue +++ b/app/assets/javascripts/ide/components/changed_file_icon.vue @@ -13,8 +13,7 @@ export default { }, computed: { changedIcon() { - if (this.file.tempFile) return 'file-addition'; - return this.file.changed ? 'file-modified' : 'git-merge'; + return this.file.tempFile ? 'file-addition' : 'file-modified'; }, changedIconClass() { return `multi-${this.changedIcon}`; |