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/services/service_desk/custom_emails/create_service.rb')
-rw-r--r--app/services/service_desk/custom_emails/create_service.rb4
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