Merged r14030 and r14031.

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14039 e93f8b46-1217-0410-a6f0-8f06a7374b81

extra/sample_plugin/app/models/meeting.rb

@@ -7,5 +7,6 @@ class Meeting < ActiveRecord::Base
                 :url => Proc.new {|o| {:controller => 'meetings', :action => 'show', :id => o.id}}
 
   acts_as_activity_provider :timestamp => 'scheduled_on',
-                            :find_options => { :include => :project }
+                            :scope => includes(:project),
+                            :permission => nil
 end

lib/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb

@@ -29,7 +29,7 @@ module Redmine
             send :include, Redmine::Acts::ActivityProvider::InstanceMethods
           end
 
-          options.assert_valid_keys(:type, :permission, :timestamp, :author_key, :find_options, :scope)
+          options.assert_valid_keys(:type, :permission, :timestamp, :author_key, :scope)
           self.activity_provider_options ||= {}
 
           # One model can provide different event types
@@ -37,7 +37,6 @@ module Redmine
           event_type = options.delete(:type) || self.name.underscore.pluralize
 
           options[:timestamp] ||= "#{table_name}.created_on"
-          options[:find_options] ||= {}
           options[:author_key] = "#{table_name}.#{options[:author_key]}" if options[:author_key].is_a?(Symbol)
           self.activity_provider_options[event_type] = options
         end