Merge commit 'rails/master'

1 files changed, 2 insertions, 2 deletions

diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 11bf6a6e72..874b3a78b6 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -128,13 +128,13 @@ module Rails
         end
       end
 
-    protected
-
       def session_options
         return @session_options unless @session_store == :cookie_store
         @session_options.merge(:secret => @secret_token)
       end
 
+    protected
+
       def default_middleware_stack
         ActionDispatch::MiddlewareStack.new.tap do |middleware|
           middleware.use('::ActionDispatch::Static', lambda { paths.public.to_a.first }, :if => lambda { serve_static_assets })