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

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

diff --git a/extra/sample_plugin/app/models/meeting.rb b/extra/sample_plugin/app/models/meeting.rb
index 251892ece687879b995853f75dd26638d2e641ae..78d801304d6aa82931a764126c1ff78fc39b6326 100644 (file)
--- a/extra/sample_plugin/app/models/meeting.rb
+++ b/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