aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/application.rb
diff options
context:
space:
mode:
Diffstat (limited to 'railties/lib/rails/application.rb')
-rw-r--r--railties/lib/rails/application.rb14
1 files changed, 7 insertions, 7 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 06acb4c877..05acd78d98 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -170,18 +170,18 @@ module Rails
#
# ==== Parameters
#
- # * +salt+ - the salt that will be used to generate the secret key of the verifier.
+ # * +verifier_name+ - the name of the message verifier.
#
# ==== Examples
#
- # message = Rails.application.message_verifier('salt').generate('my sensible data')
- # Rails.application.message_verifier('salt').verify(message)
+ # message = Rails.application.message_verifier('sensitive_data').generate('my sensible data')
+ # Rails.application.message_verifier('sensitive_data').verify(message)
# # => 'my sensible data'
#
# See the +ActiveSupport::MessageVerifier+ documentation for more information.
- def message_verifier(salt)
- @message_verifiers[salt] ||= begin
- secret = key_generator.generate_key(salt)
+ def message_verifier(verifier_name)
+ @message_verifiers[verifier_name] ||= begin
+ secret = key_generator.generate_key(verifier_name.to_s)
ActiveSupport::MessageVerifier.new(secret)
end
end
@@ -414,7 +414,7 @@ module Rails
def validate_secret_key_config! #:nodoc:
if secrets.secret_key_base.blank? && config.secret_token.blank?
- raise "You must set secret_key_base in your app's config"
+ raise "Missing `secret_key_base` for '#{Rails.env}' environment, set this value in `config/secrets.yml`"
end
end
end