From 5253952988676f43812061a100d870b2d13f860d Mon Sep 17 00:00:00 2001
From: Jure Grabnar <jgrabnar@biosistemika.com>
Date: Tue, 9 Apr 2019 13:06:54 +0200
Subject: [PATCH 1/2] Remove unlock_instructions email and update activities
 text

Closes SCI-3140
---
 test/mailers/previews/app_mailer_preview.rb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/test/mailers/previews/app_mailer_preview.rb b/test/mailers/previews/app_mailer_preview.rb
index 1d8b2b658..bdcc6fffc 100644
--- a/test/mailers/previews/app_mailer_preview.rb
+++ b/test/mailers/previews/app_mailer_preview.rb
@@ -7,10 +7,6 @@ class AppMailerPreview < ActionMailer::Preview
     AppMailer.reset_password_instructions(fake_user, 'faketoken', {})
   end
 
-  def unlock_instructions
-    AppMailer.unlock_instructions(fake_user, 'faketoken', {})
-  end
-
   def invitation_instructions
     AppMailer.invitation_instructions(fake_user, 'faketoken', {})
   end
@@ -44,7 +40,7 @@ class AppMailerPreview < ActionMailer::Preview
       Notification.new(
         type_of: :recent_changes,
         title: I18n.t(
-          'activities.create_module',
+          'global_activities.activity_name.create_module',
           user: user.full_name,
           module: 'How to shred'
         ),

From e72a2fc7d171ddf5c4cb0c252d0fd6e2f624401b Mon Sep 17 00:00:00 2001
From: Jure Grabnar <jgrabnar@biosistemika.com>
Date: Thu, 23 May 2019 13:44:08 +0200
Subject: [PATCH 2/2] Add deprecated comments to system_message_notification

---
 test/mailers/previews/app_mailer_preview.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/mailers/previews/app_mailer_preview.rb b/test/mailers/previews/app_mailer_preview.rb
index bdcc6fffc..dc6fb9760 100644
--- a/test/mailers/previews/app_mailer_preview.rb
+++ b/test/mailers/previews/app_mailer_preview.rb
@@ -53,6 +53,7 @@ class AppMailerPreview < ActionMailer::Preview
     )
   end
 
+  # <b>DEPRECATED:</b> Please use <tt>system_notification</tt> instead.
   def system_message_notification
     AppMailer.notification(
       fake_user,