diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-07 12:08:54 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-07 12:08:54 +0300 |
commit | dfa6eac07553d5a3f254ee904e4298bd666b410f (patch) | |
tree | a14e04cf628bf1bd28a0c95ed6261461605cfe2e /app/services/service_desk | |
parent | 4be549b5ebd354c69fcd2a09e2a2f642490612cf (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/service_desk')
-rw-r--r-- | app/services/service_desk/custom_email_verifications/update_service.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/services/service_desk/custom_email_verifications/update_service.rb b/app/services/service_desk/custom_email_verifications/update_service.rb index 5ef36ce0576..fbd217e3a3e 100644 --- a/app/services/service_desk/custom_email_verifications/update_service.rb +++ b/app/services/service_desk/custom_email_verifications/update_service.rb @@ -8,7 +8,7 @@ module ServiceDesk def execute return error_feature_flag_disabled unless Feature.enabled?(:service_desk_custom_email, project) return error_parameter_missing if settings.blank? || verification.blank? - return error_already_finished if already_finished_and_no_mail? + return error_already_finished if verification.finished? return error_already_failed if already_failed_and_no_mail? verification_error = verify @@ -39,10 +39,6 @@ module ServiceDesk @verification ||= settings.custom_email_verification end - def already_finished_and_no_mail? - verification.finished? && mail.blank? - end - def already_failed_and_no_mail? verification.failed? && mail.blank? end |