Commit 9894f638 authored by Martin Wortschack's avatar Martin Wortschack

Merge branch 'kp-fix-service-desk-outgoing-name' into 'master'

Fix service desk settings not showing saved Email Display Name

See merge request gitlab-org/gitlab!24681
parents 7e3f8440 6b2410f2
......@@ -18,6 +18,7 @@ export default () => {
endpoint: dataset.endpoint,
incomingEmail: dataset.incomingEmail,
selectedTemplate: dataset.selectedTemplate,
outgoingName: dataset.outgoingName,
templates: JSON.parse(dataset.templates),
};
},
......@@ -28,6 +29,7 @@ export default () => {
endpoint: this.endpoint,
initialIncomingEmail: this.incomingEmail,
selectedTemplate: this.selectedTemplate,
outgoingName: this.outgoingName,
templates: this.templates,
},
});
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment