diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-08 18:07:19 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-08 18:07:19 +0300 |
| commit | a34d7fd9a723d6cc9c7348be2afe522bdc2be67f (patch) | |
| tree | 5971e13ca0832ae06c599b3d5eec2e2fe71d884f /app/services/service_desk | |
| parent | 5f89187f0433fc84d8387de25220185235d61ed1 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/service_desk')
| -rw-r--r-- | app/services/service_desk/custom_emails/create_service.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/services/service_desk/custom_emails/create_service.rb b/app/services/service_desk/custom_emails/create_service.rb index 305f5b3fa11..c06c836f0fa 100644 --- a/app/services/service_desk/custom_emails/create_service.rb +++ b/app/services/service_desk/custom_emails/create_service.rb @@ -42,6 +42,8 @@ module ServiceDesk def create_credential credential = ::ServiceDesk::CustomEmailCredential.new(create_credential_params.merge(project: project)) credential.save + rescue ArgumentError + false end def create_verification @@ -53,7 +55,7 @@ module ServiceDesk end def create_credential_params - ensure_params.permit(:smtp_address, :smtp_port, :smtp_username, :smtp_password) + ensure_params.permit(:smtp_address, :smtp_port, :smtp_username, :smtp_password, :smtp_authentication) end def ensure_params |