Merge commit 'mainstream/master'

Conflicts:
	railties/guides/source/active_support_overview.textile

1 files changed, 0 insertions, 24 deletions

diff --git a/railties/lib/rails_generator/secret_key_generator.rb b/railties/lib/rails_generator/secret_key_generator.rb
deleted file mode 100644
index 7dd495a2f5..0000000000
--- a/railties/lib/rails_generator/secret_key_generator.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require 'active_support/deprecation'
-
-module Rails
-  # A class for creating random secret keys. This class will do its best to create a
-  # random secret key that's as secure as possible, using whatever methods are
-  # available on the current platform. For example:
-  #
-  #   generator = Rails::SecretKeyGenerator("some unique identifier, such as the application name")
-  #   generator.generate_secret     # => "f3f1be90053fa851... (some long string)"
-  #
-  # This class is *deprecated* in Rails 2.2 in favor of ActiveSupport::SecureRandom.
-  # It is currently a wrapper around ActiveSupport::SecureRandom.
-  class SecretKeyGenerator
-    def initialize(identifier)
-    end
-
-    # Generate a random secret key with the best possible method available on
-    # the current platform.
-    def generate_secret
-      ActiveSupport::SecureRandom.hex(64)
-    end
-    deprecate :generate_secret=>"You should use ActiveSupport::SecureRandom.hex(64)"
-  end
-end