aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorPrem Sichanugrist <s@sikachu.com>2012-08-15 01:22:50 -0400
committerPrem Sichanugrist <s@sikachu.com>2012-08-24 15:24:19 -0400
commit0ffe19056c8e8b2f9ae9d487b896cad2ce9387ad (patch)
tree8308e637c41e0f0bed0ffdb6b1fe96b741825f53 /railties/lib/rails
parent2c571b3f0544a6457db4818e752f4cd4bacd48b4 (diff)
downloadrails-0ffe19056c8e8b2f9ae9d487b896cad2ce9387ad.tar.gz
rails-0ffe19056c8e8b2f9ae9d487b896cad2ce9387ad.tar.bz2
rails-0ffe19056c8e8b2f9ae9d487b896cad2ce9387ad.zip
Extract ActiveRecord::SessionStore from Rails
This functionality will be available from gem `active_record-session_store` instead.
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/application/configuration.rb2
-rw-r--r--railties/lib/rails/generators.rb1
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt5
3 files changed, 0 insertions, 8 deletions
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