1 files changed, 5 insertions, 12 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 8439d4864d..5af7de720c 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -55,6 +55,7 @@ module Rails
     autoload :Bootstrap,      'rails/application/bootstrap'
     autoload :Configuration,  'rails/application/configuration'
     autoload :Finisher,       'rails/application/finisher'
+    autoload :Railties,       'rails/engine/railties'
     autoload :RoutesReloader, 'rails/application/routes_reloader'
 
     class << self
@@ -135,9 +136,10 @@ module Rails
     def env_config
       @env_config ||= begin
         if config.secret_key_base.nil?
-          ActiveSupport::Deprecation.warn "You didn't set config.secret_key_base. " +
-            "This should be used instead of the old deprecated config.secret_token. " +
-            "Set config.secret_key_base instead of config.secret_token in config/initializers/secret_token.rb"
+          ActiveSupport::Deprecation.warn "You didn't set config.secret_key_base in config/initializers/secret_token.rb file. " +
+            "This should be used instead of the old deprecated config.secret_token in order to use the new EncryptedCookieStore. " +
+            "To convert safely to the encrypted store (without losing existing cookies and sessions), see http://guides.rubyonrails.org/upgrading_ruby_on_rails.html#action-pack"
+
           if config.secret_token.blank?
             raise "You must set config.secret_key_base in your app's config"
           end
@@ -231,11 +233,6 @@ module Rails
       config.helpers_paths
     end
 
-    def railties #:nodoc:
-      @railties ||= Rails::Railtie.subclasses.map(&:instance) +
-        Rails::Engine.subclasses.map(&:instance)
-    end
-
   protected
 
     alias :build_middleware_stack :app
@@ -368,10 +365,6 @@ module Rails
         middleware.use ::Rack::Head
         middleware.use ::Rack::ConditionalGet
         middleware.use ::Rack::ETag, "no-cache"
-
-        if config.action_dispatch.best_standards_support
-          middleware.use ::ActionDispatch::BestStandardsSupport, config.action_dispatch.best_standards_support
-        end
       end
     end