Merge branch 'master' into budget

app/controllers/concerns/commentable_actions.rb

@@ -12,7 +12,7 @@ module CommentableActions
 
     @tag_cloud = tag_cloud
     @banners = Banner.with_active
-    
+
     set_resource_votes(@resources)
     set_resources_instance
   end
@@ -155,4 +155,4 @@ module CommentableActions
       nil
     end
 
-end
+end

app/controllers/concerns/moderate_actions.rb

@@ -4,9 +4,9 @@ module ModerateActions
 
   def index
     @resources = @resources.send(@current_filter)
-                       .send("sort_by_#{@current_order}")
-                       .page(params[:page])
-                       .per(50)
+                           .send("sort_by_#{@current_order}")
+                           .page(params[:page])
+                           .per(50)
     set_resources_instance
   end
 

app/controllers/concerns/polymorphic.rb

@@ -1,6 +1,7 @@
 module Polymorphic
 
   private
+
     def resource
       @resource ||= instance_variable_get("@#{resource_name}")
     end