diff options
| author | Go MAEDA <maeda@farend.jp> | 2023-01-28 04:49:24 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2023-01-28 04:49:24 +0000 |
| commit | 0dfe9d6c5622135353f02e1e2d8a9381b76c7f41 (patch) | |
| tree | 4f147315b29fd49125497c290967c97f5d38e430 | |
| parent | 65733af324ce349da41a9072d0382bef87036d19 (diff) | |
| download | redmine-0dfe9d6c5622135353f02e1e2d8a9381b76c7f41.tar.gz redmine-0dfe9d6c5622135353f02e1e2d8a9381b76c7f41.zip | |
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
| -rw-r--r-- | extra/sample_plugin/app/models/meeting.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |