1 files changed, 14 insertions, 2 deletions
diff --git a/app/mailers/previews/notify_preview.rb b/app/mailers/previews/notify_preview.rb
index c70ac1428cd..5fda60a7408 100644
--- a/app/mailers/previews/notify_preview.rb
+++ b/app/mailers/previews/notify_preview.rb
@@ -60,6 +60,10 @@ class NotifyPreview < ActionMailer::Preview
     end
   end
 
+  def new_mention_in_merge_request_email
+    Notify.new_mention_in_merge_request_email(user.id, issue.id, user.id).message
+  end
+
   def closed_issue_email
     Notify.closed_issue_email(user.id, issue.id, user.id).message
   end
@@ -84,12 +88,20 @@ class NotifyPreview < ActionMailer::Preview
     Notify.issues_csv_email(user, project, '1997,Ford,E350', { truncated: false, rows_expected: 3, rows_written: 3 }).message
   end
 
+  def new_merge_request_email
+    Notify.new_merge_request_email(user.id, merge_request.id).message
+  end
+
   def closed_merge_request_email
     Notify.closed_merge_request_email(user.id, issue.id, user.id).message
   end
 
   def merge_request_status_email
-    Notify.merge_request_status_email(user.id, merge_request.id, 'closed', user.id).message
+    Notify.merge_request_status_email(user.id, merge_request.id, 'reopened', user.id).message
+  end
+
+  def merge_request_unmergeable_email
+    Notify.merge_request_unmergeable_email(user.id, merge_request.id, 'conflict').message
   end
 
   def merged_merge_request_email
@@ -169,7 +181,7 @@ class NotifyPreview < ActionMailer::Preview
     cleanup do
       note = create_note(noteable_type: 'Issue', noteable_id: issue.id, note: 'Issue note content')
 
-      Notify.service_desk_new_note_email(issue.id, note.id).message
+      Notify.service_desk_new_note_email(issue.id, note.id, 'someone@gitlab.com').message
     end
   end