From 0ffe19056c8e8b2f9ae9d487b896cad2ce9387ad Mon Sep 17 00:00:00 2001
From: Prem Sichanugrist <s@sikachu.com>
Date: Wed, 15 Aug 2012 01:22:50 -0400
Subject: Extract ActiveRecord::SessionStore from Rails

This functionality will be available from gem
`active_record-session_store` instead.
---
 railties/lib/rails/application/configuration.rb                      | 2 --
 railties/lib/rails/generators.rb                                     | 1 -
 .../rails/app/templates/config/initializers/session_store.rb.tt      | 5 -----
 3 files changed, 8 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 7f05b2e7e1..f8ddeeb99e 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -125,8 +125,6 @@ module Rails
           case @session_store
           when :disabled
             nil
-          when :active_record_store
-            ActiveRecord::SessionStore
           when Symbol
             ActionDispatch::Session.const_get(@session_store.to_s.camelize)
           else
diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb
index 4fa990171d..a8c0626a41 100644
--- a/railties/lib/rails/generators.rb
+++ b/railties/lib/rails/generators.rb
@@ -173,7 +173,6 @@ module Rails
           "#{orm}:migration",
           "#{orm}:model",
           "#{orm}:observer",
-          "#{orm}:session_migration",
           "#{test}:controller",
           "#{test}:helper",
           "#{test}:integration",
diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt
index ff676280cb..4a099a4ce2 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt
@@ -1,8 +1,3 @@
 # Be sure to restart your server when you modify this file.
 
 <%= app_const %>.config.session_store :cookie_store, key: <%= "'_#{app_name}_session'" %>
-
-# Use the database for sessions instead of the cookie-based default,
-# which shouldn't be used to store highly confidential information
-# (create the session table with "rails generate session_migration").
-# <%= app_const %>.config.session_store :active_record_store
-- 
cgit v1.2.3