Fix most auto-correctable rubocop issues

[rails.git] / app / models / notifier.rb

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index b1a94a77de0ccfe517edb96e9228f2eddef520d2..be7b8d145ee2832df789127b70b3654346f374c9 100644 (file)
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -166,7 +166,7 @@ class Notifier < ActionMailer::Base
     end
   end
 
     end
   end
 

-private
+  private

 
   def with_recipient_locale(recipient)
     old_locale = I18n.locale
 
   def with_recipient_locale(recipient)
     old_locale = I18n.locale


@@ -181,8 +181,8 @@ private
   end
 
   def from_address(name, type, id, digest)
   end
 
   def from_address(name, type, id, digest)

-    if Object.const_defined?(:MESSAGES_DOMAIN) and domain = MESSAGES_DOMAIN
-      "#{name} <#{type}-#{id}-#{digest[0,6]}@#{domain}>"
+    if Object.const_defined?(:MESSAGES_DOMAIN) && domain = MESSAGES_DOMAIN
+      "#{name} <#{type}-#{id}-#{digest[0, 6]}@#{domain}>"

     else
       EMAIL_FROM
     end
     else
       EMAIL_FROM
     end