diff options
| author | Steven Burgart <skburgart@gmail.com> | 2015-01-18 10:29:37 -0500 |
|---|---|---|
| committer | Steven Burgart <skburgart@gmail.com> | 2015-01-18 10:29:37 -0500 |
| commit | 5c801602189bdf179432e9ef5885f6c6fef438f2 (patch) | |
| tree | 39e96188549956bc7a32ccfd9285b1dc9f3fa772 /app/mailers | |
| parent | 7d5d5e53b11db478946e6c477a9a59b0be9b6d5b (diff) | |
| download | gitlab-ce-5c801602189bdf179432e9ef5885f6c6fef438f2.tar.gz | |
Fix various typos
signe-in -> signed-in
go_to_gihub_for_permissions -> go_to_github_for_permissions
descendand -> descendant
behavour -> behaviour
recepient_email -> recipient_email
generate_fingerpint -> generate_fingerprint
dependes -> depends
Cant't -> Can't
wisit -> visit
notifcation -> notification
sufficent_scope -> sufficient_scope?
levet -> level
Diffstat (limited to 'app/mailers')
| -rw-r--r-- | app/mailers/emails/merge_requests.rb | 2 | ||||
| -rw-r--r-- | app/mailers/notify.rb | 4 |
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' |