Commit 08196615 authored by http://jneen.net/'s avatar http://jneen.net/ Committed by Felipe Artur

use a SentNotification.reply_key

parent 4d202249
...@@ -33,14 +33,14 @@ module EE ...@@ -33,14 +33,14 @@ module EE
refresh_service_desk_key! if service_desk_mail_key.blank? refresh_service_desk_key! if service_desk_mail_key.blank?
from = "service_desk+#{service_desk_mail_key}" from = "service_desk+#{service_desk_mail_key}"
Gitlab::IncomingEmail.reply_address(from) ::Gitlab::IncomingEmail.reply_address(from)
end end
def refresh_service_desk_key! def refresh_service_desk_key!
return unless ::Gitlab::EE::ServiceDesk.enabled? return unless ::Gitlab::EE::ServiceDesk.enabled?
return unless self.service_desk_enabled? return unless self.service_desk_enabled?
self.service_desk_mail_key = Devise.friendly_token(16) self.service_desk_mail_key = SentNotification.reply_key
end end
private private
......
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