diff options
| -rw-r--r-- | actionpack/lib/action_controller.rb | 4 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/record_identifier.rb | 8 |
2 files changed, 12 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb index 09029633fc..153e13f2db 100644 --- a/actionpack/lib/action_controller.rb +++ b/actionpack/lib/action_controller.rb @@ -46,6 +46,10 @@ module ActionController autoload :TestCase, 'action_controller/test_case' autoload :TemplateAssertions, 'action_controller/test_case' + eager_autoload do + autoload :RecordIdentifier + end + def self.eager_load! super ActionController::Caching.eager_load! diff --git a/actionpack/lib/action_controller/record_identifier.rb b/actionpack/lib/action_controller/record_identifier.rb new file mode 100644 index 0000000000..7b6a5bb25c --- /dev/null +++ b/actionpack/lib/action_controller/record_identifier.rb @@ -0,0 +1,8 @@ +require 'active_support/deprecation' +require 'action_view/record_identifier' + +module ActionController + RecordIdentifier = ActionView::RecordIdentifier + ActiveSupport::Deprecation.warn "ActionController::RecordIdentifier was renamed to ActionView::RecordIdentifier. " + + "Please use it instead. ActionController::RecordIdentifier will be removed in Rails 4.1" +end |