summaryrefslogtreecommitdiff
path: root/app/mailers
diff options
context:
space:
mode:
Diffstat (limited to 'app/mailers')
-rw-r--r--app/mailers/emails/merge_requests.rb2
-rw-r--r--app/mailers/notify.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/app/mailers/emails/merge_requests.rb b/app/mailers/emails/merge_requests.rb
index 9ecdac87d72..7f6c855c301 100644
--- a/app/mailers/emails/merge_requests.rb
+++ b/app/mailers/emails/merge_requests.rb
@@ -56,7 +56,7 @@ module Emails
end
end
- # Over rides default behavour to show source/target
+ # Over rides default behaviour to show source/target
# Formats arguments into a String suitable for use as an email subject
#
# extra - Extra Strings to be inserted into the subject
diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb
index 6d671e6e0bd..5ae07d771fa 100644
--- a/app/mailers/notify.rb
+++ b/app/mailers/notify.rb
@@ -26,8 +26,8 @@ class Notify < ActionMailer::Base
delay_for(2.seconds)
end
- def test_email(recepient_email, subject, body)
- mail(to: recepient_email,
+ def test_email(recipient_email, subject, body)
+ mail(to: recipient_email,
subject: subject,
body: body.html_safe,
content_type: 'text/html'