use a SentNotification.reply_key

08196615 · http://jneen.net/ · Felipe Artur · 4d202249 · 08196615
Commit 08196615 authored Apr 03, 2017 by http://jneen.net/ Committed by Felipe Artur Apr 06, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

app/models/ee/project.rb app/models/ee/project.rb +2 -2

No files found.
--- a/app/models/ee/project.rb
+++ b/app/models/ee/project.rb
@@ -33,14 +33,14 @@ module EE
      refresh_service_desk_key! if service_desk_mail_key.blank?

      from = "service_desk+#{service_desk_mail_key}"
-      Gitlab::IncomingEmail.reply_address(from)
+      ::Gitlab::IncomingEmail.reply_address(from)
    end

    def refresh_service_desk_key!
      return unless ::Gitlab::EE::ServiceDesk.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

    private