Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-12-03 12:10:57 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-12-03 12:10:57 +0300
commitcc8ea69201e2e4d020018c43efeb993c44cd8a71 (patch)
tree6f8ae78a9b68bfcab2fa670a46c659f198fb1c53 /app/assets/javascripts/issuable
parentb29d7709c1c992d4e5aa481155ef60003cd43d55 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/issuable')
-rw-r--r--app/assets/javascripts/issuable/components/issuable_by_email.vue3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/assets/javascripts/issuable/components/issuable_by_email.vue b/app/assets/javascripts/issuable/components/issuable_by_email.vue
index 799d2bdc9e2..512fa6f8c68 100644
--- a/app/assets/javascripts/issuable/components/issuable_by_email.vue
+++ b/app/assets/javascripts/issuable/components/issuable_by_email.vue
@@ -54,8 +54,7 @@ export default {
data() {
return {
email: this.initialEmail,
- // eslint-disable-next-line @gitlab/require-i18n-strings
- issuableName: this.issuableType === 'issue' ? 'issue' : 'merge request',
+ issuableName: this.issuableType === 'issue' ? __('issue') : __('merge request'),
};
},
computed: {