mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Subclasses of ActionController::Caching::Sweeper should be Reloadable
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3517 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
f791fe7621
commit
49401f880c
2 changed files with 5 additions and 2 deletions
|
@ -1,5 +1,7 @@
|
|||
*SVN*
|
||||
|
||||
* Subclasses of ActionController::Caching::Sweeper should be Reloadable. [Rick Olson]
|
||||
|
||||
* Document the :xhr option for verifications. #3666 [leeo]
|
||||
|
||||
* Added :only and :except controls to skip_before/after_filter just like for when you add filters [DHH]
|
||||
|
|
|
@ -521,9 +521,10 @@ module ActionController #:nodoc:
|
|||
class Sweeper < ActiveRecord::Observer #:nodoc:
|
||||
attr_accessor :controller
|
||||
|
||||
# ActiveRecord::Observer will mark this class as reloadable even though it should be
|
||||
# ActiveRecord::Observer will mark this class as reloadable even though it should not be.
|
||||
# However, subclasses of ActionController::Caching::Sweeper should be Reloadable
|
||||
def self.included_modules
|
||||
super() - [ Reloadable ]
|
||||
self == Sweeper ? super() - [ Reloadable ] : super()
|
||||
end
|
||||
|
||||
def before(controller)
|
||||
|
|
Loading…
Reference in a new issue