Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 0 deletions

diff --git a/app/mailers/previews/notify_preview.rb b/app/mailers/previews/notify_preview.rb
index f29d0d990b6..dee91789f50 100644
--- a/app/mailers/previews/notify_preview.rb
+++ b/app/mailers/previews/notify_preview.rb
@@ -84,6 +84,10 @@ 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
@@ -92,6 +96,10 @@ class NotifyPreview < ActionMailer::Preview
     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
     Notify.merged_merge_request_email(user.id, merge_request.id, user.id).message
   end