Merged r22079 from trunk to 4.2-stable (#38114).

git-svn-id: https://svn.redmine.org/redmine/branches/4.2-stable@22081 e93f8b46-1217-0410-a6f0-8f06a7374b81

extra/sample_plugin/app/models/meeting.rb

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