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:
Diffstat (limited to 'app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue')
-rw-r--r--app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue22
1 files changed, 11 insertions, 11 deletions
diff --git a/app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue b/app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue
index 38a2c12d137..5078cbbdf59 100644
--- a/app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue
+++ b/app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue
@@ -49,12 +49,12 @@ export default {
required: false,
default: '',
},
- customEmail: {
+ serviceDeskEmail: {
type: String,
required: false,
default: '',
},
- customEmailEnabled: {
+ serviceDeskEmailEnabled: {
type: Boolean,
required: false,
},
@@ -101,22 +101,22 @@ export default {
},
computed: {
hasProjectKeySupport() {
- return Boolean(this.customEmailEnabled);
+ return Boolean(this.serviceDeskEmailEnabled);
},
email() {
- return this.customEmail || this.incomingEmail;
+ return this.serviceDeskEmail || this.incomingEmail;
},
- hasCustomEmail() {
- return this.customEmail && this.customEmail !== this.incomingEmail;
+ hasServiceDeskEmail() {
+ return this.serviceDeskEmail && this.serviceDeskEmail !== this.incomingEmail;
},
emailSuffixHelpUrl() {
return helpPagePath('user/project/service_desk.html', {
- anchor: 'configure-a-custom-email-address-suffix',
+ anchor: 'configure-a-suffix-for-service-desk-alias-email',
});
},
- customEmailAddressHelpUrl() {
+ serviceDeskEmailAddressHelpUrl() {
return helpPagePath('user/project/service_desk.html', {
- anchor: 'use-a-custom-email-address',
+ anchor: 'use-an-additional-service-desk-alias-email',
});
},
issuesHelpPagePath() {
@@ -204,7 +204,7 @@ export default {
<clipboard-button :title="__('Copy')" :text="email" css-class="input-group-text" />
</template>
</gl-form-input-group>
- <template v-if="email && hasCustomEmail" #description>
+ <template v-if="email && hasServiceDeskEmail" #description>
<span class="gl-mt-2 gl-display-inline-block">
<gl-sprintf :message="__('Emails sent to %{email} are also supported.')">
<template #email>
@@ -260,7 +260,7 @@ export default {
>
<template #link="{ content }">
<gl-link
- :href="customEmailAddressHelpUrl"
+ :href="serviceDeskEmailAddressHelpUrl"
target="_blank"
class="gl-text-blue-600 font-size-inherit"
>{{ content }}