3 files changed, 0 insertions, 36 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index 9cacb3862b..9fdad63b45 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -46,10 +46,6 @@ 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/base.rb b/actionpack/lib/action_controller/base.rb
index 971c4189c8..d7b09b67c0 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -223,7 +223,6 @@ module ActionController
       ForceSSL,
       Streaming,
       DataStreaming,
-      RecordIdentifier,
       HttpAuthentication::Basic::ControllerMethods,
       HttpAuthentication::Digest::ControllerMethods,
       HttpAuthentication::Token::ControllerMethods,
diff --git a/actionpack/lib/action_controller/record_identifier.rb b/actionpack/lib/action_controller/record_identifier.rb
deleted file mode 100644
index d598bac467..0000000000
--- a/actionpack/lib/action_controller/record_identifier.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-require 'action_view/record_identifier'
-
-module ActionController
-  module RecordIdentifier
-    MODULE_MESSAGE = 'Calling ActionController::RecordIdentifier.%s is deprecated and ' \
-      'will be removed in Rails 4.1, please call using ActionView::RecordIdentifier instead.'
-    INSTANCE_MESSAGE = '%s method will no longer be included by default in controllers ' \
-      'since Rails 4.1. If you would like to use it in controllers, please include ' \
-      'ActionView::RecordIdentifier module.'
-
-    def dom_id(record, prefix = nil)
-      ActiveSupport::Deprecation.warn(INSTANCE_MESSAGE % 'dom_id')
-      ActionView::RecordIdentifier.dom_id(record, prefix)
-    end
-
-    def dom_class(record, prefix = nil)
-      ActiveSupport::Deprecation.warn(INSTANCE_MESSAGE % 'dom_class')
-      ActionView::RecordIdentifier.dom_class(record, prefix)
-    end
-
-    def self.dom_id(record, prefix = nil)
-      ActiveSupport::Deprecation.warn(MODULE_MESSAGE % 'dom_id')
-      ActionView::RecordIdentifier.dom_id(record, prefix)
-    end
-
-    def self.dom_class(record, prefix = nil)
-      ActiveSupport::Deprecation.warn(MODULE_MESSAGE % 'dom_class')
-      ActionView::RecordIdentifier.dom_class(record, prefix)
-    end
-  end
-end