1 files changed, 0 insertions, 32 deletions
diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb
index 0cb4041855..d26b7e2486 100644
--- a/actionpack/lib/action_controller/railtie.rb
+++ b/actionpack/lib/action_controller/railtie.rb
@@ -2,8 +2,6 @@ require "rails"
 require "action_controller"
 require "action_dispatch/railtie"
 require "action_view/railtie"
-require "active_support/deprecation/proxy_wrappers"
-require "active_support/deprecation"
 require "abstract_controller/railties/routes_helpers"
 require "action_controller/railties/paths"
 
@@ -11,28 +9,6 @@ module ActionController
   class Railtie < Rails::Railtie
     config.action_controller = ActiveSupport::OrderedOptions.new
 
-    config.action_controller.singleton_class.tap do |d|
-      d.send(:define_method, :session) do
-        ActiveSupport::Deprecation.warn "config.action_controller.session has been deprecated. " <<
-          "Please use Rails.application.config.session_store instead.", caller
-      end
-
-      d.send(:define_method, :session=) do |val|
-        ActiveSupport::Deprecation.warn "config.action_controller.session= has been deprecated. " <<
-          "Please use config.session_store(name, options) instead.", caller
-      end
-
-      d.send(:define_method, :session_store) do
-        ActiveSupport::Deprecation.warn "config.action_controller.session_store has been deprecated. " <<
-          "Please use Rails.application.config.session_store instead.", caller
-      end
-
-      d.send(:define_method, :session_store=) do |val|
-        ActiveSupport::Deprecation.warn "config.action_controller.session_store= has been deprecated. " <<
-          "Please use config.session_store(name, options) instead.", caller
-      end
-    end
-
     initializer "action_controller.logger" do
       ActiveSupport.on_load(:action_controller) { self.logger ||= Rails.logger }
     end
@@ -57,13 +33,5 @@ module ActionController
         options.each { |k,v| send("#{k}=", v) }
       end
     end
-
-    initializer "action_controller.deprecated_routes" do |app|
-      message = "ActionController::Routing::Routes is deprecated. " \
-                "Instead, use Rails.application.routes"
-
-      proxy = ActiveSupport::Deprecation::DeprecatedObjectProxy.new(app.routes, message)
-      ActionController::Routing::Routes = proxy
-    end
   end
 end