diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-05-23 22:43:08 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-05-23 22:43:08 +0530 |
| commit | 1ad0b378cc081937c117577ab628f2160fcc448d (patch) | |
| tree | a675d20ea606caa653010c57b90d10f173f7dd93 /activesupport/lib/active_support/message_encryptor.rb | |
| parent | 2642c2961cda2074cc1495a4635898ca8ab33adf (diff) | |
| download | rails-1ad0b378cc081937c117577ab628f2160fcc448d.tar.gz rails-1ad0b378cc081937c117577ab628f2160fcc448d.tar.bz2 rails-1ad0b378cc081937c117577ab628f2160fcc448d.zip | |
Revert "Remove blank trailing comments"
This reverts commit fa6d921e11363e9b8c4bc10f7aed0b9faffdc33a.
Reason: Not a fan of such massive changes. We usually close such changes
if made to Rails master as a pull request. Following the same principle
here and reverting.
[ci skip]
Diffstat (limited to 'activesupport/lib/active_support/message_encryptor.rb')
| -rw-r--r-- | activesupport/lib/active_support/message_encryptor.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/message_encryptor.rb b/activesupport/lib/active_support/message_encryptor.rb index c002b1c02c..ada2e79ccb 100644 --- a/activesupport/lib/active_support/message_encryptor.rb +++ b/activesupport/lib/active_support/message_encryptor.rb @@ -36,6 +36,7 @@ module ActiveSupport # Options: # * <tt>:cipher</tt> - Cipher to use. Can be any cipher returned by <tt>OpenSSL::Cipher.ciphers</tt>. Default is 'aes-256-cbc' # * <tt>:serializer</tt> - Object serializer to use. Default is +Marshal+. + # def initialize(secret, options = {}) @secret = secret @cipher = options[:cipher] || 'aes-256-cbc' |