summaryrefslogtreecommitdiffstats
path: root/app/models/mailer.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-03-04 12:38:34 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-03-04 12:38:34 +0000
commitd862843c9d58461fbdaa0f50e8a80197462a01b6 (patch)
treea9665c9ba7cb70cfedb644cb979ba04571271f74 /app/models/mailer.rb
parent1b923819e8305bfe324c9c59e745f61c9c49ef06 (diff)
downloadredmine-d862843c9d58461fbdaa0f50e8a80197462a01b6.tar.gz
redmine-d862843c9d58461fbdaa0f50e8a80197462a01b6.zip
Renamed Mailer#test to Mailer#test_email.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9080 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/mailer.rb')
-rw-r--r--app/models/mailer.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 2502ce2e0..e54170604 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -290,12 +290,12 @@ class Mailer < ActionMailer::Base
render_multipart('register', body)
end
- def test(user)
+ def test_email(user)
set_language_if_valid(user.language)
recipients user.mail
subject 'Redmine test'
body :url => url_for(:controller => 'welcome')
- render_multipart('test', body)
+ render_multipart('test_email', body)
end
# Overrides default deliver! method to prevent from sending an email