diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 08:27:35 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 08:27:35 +0000 |
| commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
| tree | c8f718a08e110ad7e1894510980d2155a6549197 /app/assets/javascripts/projects/settings_service_desk/index.js | |
| parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) | |
| download | gitlab-ce-7e9c479f7de77702622631cff2628a9c8dcbc627.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'app/assets/javascripts/projects/settings_service_desk/index.js')
| -rw-r--r-- | app/assets/javascripts/projects/settings_service_desk/index.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/projects/settings_service_desk/index.js b/app/assets/javascripts/projects/settings_service_desk/index.js index 15c077de72e..c73163788ef 100644 --- a/app/assets/javascripts/projects/settings_service_desk/index.js +++ b/app/assets/javascripts/projects/settings_service_desk/index.js @@ -17,6 +17,7 @@ export default () => { initialIsEnabled: parseBoolean(dataset.enabled), endpoint: dataset.endpoint, incomingEmail: dataset.incomingEmail, + customEmail: dataset.customEmail, selectedTemplate: dataset.selectedTemplate, outgoingName: dataset.outgoingName, projectKey: dataset.projectKey, @@ -28,7 +29,8 @@ export default () => { props: { initialIsEnabled: this.initialIsEnabled, endpoint: this.endpoint, - initialIncomingEmail: this.incomingEmail, + incomingEmail: this.incomingEmail, + customEmail: this.customEmail, selectedTemplate: this.selectedTemplate, outgoingName: this.outgoingName, projectKey: this.projectKey, |