Merge pull request #12279 from jbaudanza/reset_session

Calling reset_session inside of a controller with a NullSessionHash raises a nil exception.

actionpack/lib/action_controller/metal/request_forgery_protection.rb

@@ -124,6 +124,9 @@ def initialize(env)
             @loaded = true
           end
 
+          # no-op
+          def destroy; end
+
           def exists?
             true
           end

actionpack/test/controller/request_forgery_protection_test.rb

@@ -78,6 +78,11 @@ def encrypted
     cookies.encrypted[:foo] = 'bar'
     render :nothing => true
   end
+
+  def try_to_reset_session
+    reset_session
+    render :nothing => true
+  end
 end
 
 class FreeCookieController < RequestForgeryProtectionControllerUsingResetSession
@@ -320,6 +325,11 @@ def setup
     post :encrypted
     assert_response :ok
   end
+
+  test 'should allow reset_session' do
+    post :try_to_reset_session
+    assert_response :ok
+  end
 end
 
 class RequestForgeryProtectionControllerUsingExceptionTest < ActionController::TestCase