diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-13 12:09:22 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-13 12:09:22 +0000 |
commit | 286fe61013674fe2d245ffc8d2233baf09923e70 (patch) | |
tree | 2037291f5863105e54e75be056b49f7d62007cae /app/assets/javascripts/vue_shared | |
parent | 4cb5e5011abfe8d50ac3a7ebd0018c563c6d7af4 (diff) | |
download | gitlab-ce-286fe61013674fe2d245ffc8d2233baf09923e70.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_shared')
-rw-r--r-- | app/assets/javascripts/vue_shared/components/changed_file_icon.vue | 14 |
1 files changed, 2 insertions, 12 deletions
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 9ec99ac93d7..7acbe949151 100644 --- a/app/assets/javascripts/vue_shared/components/changed_file_icon.vue +++ b/app/assets/javascripts/vue_shared/components/changed_file_icon.vue @@ -1,7 +1,7 @@ <script> import { GlTooltipDirective } from '@gitlab/ui'; import Icon from '~/vue_shared/components/icon.vue'; -import { __, sprintf } from '~/locale'; +import { __ } from '~/locale'; import { getCommitIconMap } from '~/ide/utils'; export default { @@ -51,17 +51,7 @@ export default { tooltipTitle() { if (!this.showTooltip || !this.file.changed) return undefined; - const type = this.file.tempFile ? 'addition' : 'modification'; - - if (this.file.staged) { - return sprintf(__('Staged %{type}'), { - type, - }); - } - - return sprintf(__('Unstaged %{type}'), { - type, - }); + return this.file.tempFile ? __('Added') : __('Modified'); }, showIcon() { return ( |