Merge pull request #1660 from consul/fix/rubocop_issues

Fix some Rubocop issues

app/models/notification.rb

@@ -17,7 +17,9 @@ class Notification < ActiveRecord::Base
   end
 
   def self.add(user_id, notifiable)
-    if notification = Notification.find_by(user_id: user_id, notifiable: notifiable)
+    notification = Notification.find_by(user_id: user_id, notifiable: notifiable)
+
+    if notification.present?
       Notification.increment_counter(:counter, notification.id)
     else
       Notification.create!(user_id: user_id, notifiable: notifiable)
@@ -50,4 +52,4 @@ class Notification < ActiveRecord::Base
     notifiable.is_a?(ProposalNotification) ? notifiable.proposal : notifiable
   end
 
-end
+end

app/models/officing/residence.rb

@@ -62,7 +62,7 @@ class Officing::Residence
                document_type:   document_type).first
   end
 
-   def residence_in_madrid
+  def residence_in_madrid
     return if errors.any?
 
     unless residency_valid?

app/models/site_customization/image.rb

@@ -21,9 +21,8 @@ class SiteCustomization::Image < ActiveRecord::Base
   def self.image_path_for(filename)
     image_name = filename.split(".").first
 
-    if i = find_by(name: image_name)
-      i.image.exists? ? i.image.url : nil
-    end
+    imageable = find_by(name: image_name)
+    imageable.present? && imageable.image.exists? ? imageable.image.url : nil
   end
 
   def required_width