lib/effective_logging/engine.rb in effective_logging-1.6.0 vs lib/effective_logging/engine.rb in effective_logging-1.7.0

@@ -27,16 +27,18 @@
 
     # Include acts_as_loggable concern and allow any ActiveRecord object to call it with log_changes()
     initializer 'effective_logging.active_record' do |app|
       ActiveSupport.on_load :active_record do
         ActiveRecord::Base.extend(ActsAsLoggable::ActiveRecord)
+        ActiveRecord::Base.extend(ActsAsTrashable::ActiveRecord)
       end
     end
 
     # Register the log_page_views concern so that it can be called in ActionController or elsewhere
     initializer 'effective_logging.log_changes_action_controller' do |app|
       ActiveSupport.on_load :action_controller do
         ActionController::Base.include(EffectiveLogging::LogChangesUser)
+        ActionController::Base.send(:before_action, :set_effective_logging_current_user)
       end
     end
 
     # Register the log_page_views concern so that it can be called in ActionController or elsewhere
     initializer 'effective_logging.action_controller' do |app|