diff options
| author | Paul Slaughter <pslaughter@gitlab.com> | 2019-09-01 02:58:31 +0000 |
|---|---|---|
| committer | Paul Slaughter <pslaughter@gitlab.com> | 2019-09-01 02:58:31 +0000 |
| commit | bfed409d373b7f373c8dd5f33aade3c620690fec (patch) | |
| tree | 9b4c5d185b5993f59c8c655aa323bb261b21630c /app | |
| parent | dc864927246746a34b675c7ee8ffbd1b533841e0 (diff) | |
| parent | 9575288f6259e37726c61451478b9c7d5a73b843 (diff) | |
| download | gitlab-ce-bfed409d373b7f373c8dd5f33aade3c620690fec.tar.gz | |
Merge branch 'refactor/showStagedIcon' into 'master'
Refactor showStagedIcon property's behavior to match its name
Closes #66071
See merge request gitlab-org/gitlab-ce!32333
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/ide/components/file_row_extra.vue | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/changed_file_icon.vue | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/ide/components/file_row_extra.vue b/app/assets/javascripts/ide/components/file_row_extra.vue index 7254c50a568..48be97c8952 100644 --- a/app/assets/javascripts/ide/components/file_row_extra.vue +++ b/app/assets/javascripts/ide/components/file_row_extra.vue @@ -86,7 +86,7 @@ export default { v-else-if="showChangedFileIcon" :file="file" :show-tooltip="true" - :show-staged-icon="true" + :show-staged-icon="false" /> <new-dropdown :type="file.type" diff --git a/app/assets/javascripts/vue_shared/components/changed_file_icon.vue b/app/assets/javascripts/vue_shared/components/changed_file_icon.vue index beb2ac09992..a97538d813a 100644 --- a/app/assets/javascripts/vue_shared/components/changed_file_icon.vue +++ b/app/assets/javascripts/vue_shared/components/changed_file_icon.vue @@ -24,7 +24,7 @@ export default { showStagedIcon: { type: Boolean, required: false, - default: false, + default: true, }, size: { type: Number, @@ -41,7 +41,7 @@ export default { changedIcon() { // False positive i18n lint: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/26 // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings - const suffix = !this.file.changed && this.file.staged && !this.showStagedIcon ? '-solid' : ''; + const suffix = !this.file.changed && this.file.staged && this.showStagedIcon ? '-solid' : ''; return `${getCommitIconMap(this.file).icon}${suffix}`; }, |