From 4bf965cbc6b0575ae7cc9157ef9f0efe4e681260 Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Sat, 28 Jan 2023 04:51:20 +0000 Subject: [PATCH] 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- 2.39.5