Merge branch 'rename-reply-by-email' into 'master'

Rename reply_by_email to incoming_email to prepare for the future.

Closes #2579.

See merge request !1367

1 files changed, 6 insertions, 0 deletions

diff --git a/app/models/sent_notification.rb b/app/models/sent_notification.rb
index 03425389dd3..3eed5c16e45 100644
--- a/app/models/sent_notification.rb
+++ b/app/models/sent_notification.rb
@@ -25,6 +25,12 @@ class SentNotification < ActiveRecord::Base
   validates :line_code, format: { with: /\A[a-z0-9]+_\d+_\d+\Z/ }, allow_blank: true
 
   class << self
+    def reply_key
+      return nil unless Gitlab::IncomingEmail.enabled?
+
+      SecureRandom.hex(16)
+    end
+
     def for(reply_key)
       find_by(reply_key: reply_key)
     end