Download as
Browse Code »

Commit 8298d81c61a650fdcadbc82ef5cc454f583ab9d1

Authored by Rodrigo Souto
1 parent 6adc8bc2
Exists in master and in 27 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

rails3: rename user mailer class

Showing 3 changed files with 4 additions and 4 deletions   Show diff stats
app/mailers/user_mailer.rb
  Diff comments   View file @8298d81
1 -class User::Mailer < ActionMailer::Base 1 +class UserMailer < ActionMailer::Base
2 def activation_email_notify(user) 2 def activation_email_notify(user)
3 user_email = "#{user.login}@#{user.email_domain}" 3 user_email = "#{user.login}@#{user.email_domain}"
4 @name = user.name 4 @name = user.name
app/models/email_activation.rb
  Diff comments   View file @8298d81
@@ -34,7 +34,7 @@ class EmailActivation &lt; Task @@ -34,7 +34,7 @@ class EmailActivation &lt; Task
34 34
35 # :nodoc: 35 # :nodoc:
36 def after_finish 36 def after_finish
37 - User::Mailer.activation_email_notify(person.user).deliver 37 + UserMailer.activation_email_notify(person.user).deliver
38 end 38 end
39 39
40 def sends_email? 40 def sends_email?
app/models/user.rb
  Diff comments   View file @8298d81
@@ -112,7 +112,7 @@ class User &lt; ActiveRecord::Base @@ -112,7 +112,7 @@ class User &lt; ActiveRecord::Base
112 false 112 false
113 else 113 else
114 if environment.enabled?('send_welcome_email_to_new_users') && environment.has_signup_welcome_text? 114 if environment.enabled?('send_welcome_email_to_new_users') && environment.has_signup_welcome_text?
115 - User::Mailer.delay.signup_welcome_email(self) 115 + UserMailer.delay.signup_welcome_email(self)
116 end 116 end
117 true 117 true
118 end 118 end
@@ -323,7 +323,7 @@ class User &lt; ActiveRecord::Base @@ -323,7 +323,7 @@ class User &lt; ActiveRecord::Base
323 323
324 def deliver_activation_code 324 def deliver_activation_code
325 return if person.is_template? 325 return if person.is_template?
326 - User::Mailer.activation_code(self).deliver unless self.activation_code.blank? 326 + UserMailer.activation_code(self).deliver unless self.activation_code.blank?
327 end 327 end
328 328
329 def delay_activation_check 329 def delay_activation_check