aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2013-04-02 17:02:02 -0700
committerSantiago Pastorino <santiago@wyeworks.com>2013-04-02 17:02:02 -0700
commitac6fc606213f591f8e2c249b144843354c69af3c (patch)
treefe5249768ce475e0f19ae7213fa51b09d76f1989 /railties/lib
parente130e96f8be3f56d5e8878b6a05259f70d9292b7 (diff)
parent7c7a42734406c4f1d402d32ff0b1b916545d0da0 (diff)
downloadrails-ac6fc606213f591f8e2c249b144843354c69af3c.tar.gz
rails-ac6fc606213f591f8e2c249b144843354c69af3c.tar.bz2
rails-ac6fc606213f591f8e2c249b144843354c69af3c.zip
Merge pull request #10061 from trevorturk/dummy-key-generator-rename
Rename DummyKeyGenerator -> LegacyKeyGenerator
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/application.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 455ceed5f8..1a99e3beca 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -1,6 +1,6 @@
require 'fileutils'
require 'active_support/core_ext/object/blank'
-# FIXME remove DummyKeyGenerator and this require in 4.1
+# FIXME remove LegacyKeyGenerator and this require in 4.1
require 'active_support/key_generator'
require 'rails/engine'
@@ -112,7 +112,7 @@ module Rails
key_generator = ActiveSupport::KeyGenerator.new(config.secret_key_base, iterations: 1000)
ActiveSupport::CachingKeyGenerator.new(key_generator)
else
- ActiveSupport::DummyKeyGenerator.new(config.secret_token)
+ ActiveSupport::LegacyKeyGenerator.new(config.secret_token)
end
end
end