From: Go MAEDA <maeda@farend.jp>
Date: Sat, 28 Jan 2023 04:49:24 +0000 (+0000)
Subject: Merged r22079 from trunk to 5.0-stable (#38114).
X-Git-Tag: 5.0.5~10
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0dfe9d6c5622135353f02e1e2d8a9381b76c7f41;p=redmine.git

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 251892ece..78d801304 100644
--- 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