Allow users to opt-out from the ActionController extensions

This commit is contained in:
Jean Boussier 2014-08-14 10:28:36 -04:00
parent 7e7d8a721c
commit 0d31e72d22
2 changed files with 9 additions and 2 deletions

View File

@ -29,6 +29,11 @@ module ActionController
include ActionController::Renderers include ActionController::Renderers
class << self
attr_accessor :enabled
end
self.enabled = true
included do included do
class_attribute :_serialization_scope class_attribute :_serialization_scope
self._serialization_scope = :current_user self._serialization_scope = :current_user

View File

@ -8,8 +8,10 @@ begin
require 'action_controller' require 'action_controller'
require 'action_controller/serialization' require 'action_controller/serialization'
ActiveSupport.on_load(:action_controller) do ActiveSupport.on_load(:after_initialize) do
include ::ActionController::Serialization if ::ActionController::Serialization.enabled
ActionController::Base.send(:include, ::ActionController::Serialization)
end
end end
rescue LoadError rescue LoadError
# rails not installed, continuing # rails not installed, continuing