aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/message_encryptor.rb
diff options
context:
space:
mode:
authorHenrik Hodne <dvyjones@dvyjones.com>2012-05-20 01:29:13 +0200
committerHenrik Hodne <dvyjones@dvyjones.com>2012-05-20 01:29:13 +0200
commitfa6d921e11363e9b8c4bc10f7aed0b9faffdc33a (patch)
tree1e4fd51d0d58cb5b5f210eeb6842ca3ada999243 /activesupport/lib/active_support/message_encryptor.rb
parent7eb09aed874dbb5f50a9ac0d0dec22e42f6161be (diff)
downloadrails-fa6d921e11363e9b8c4bc10f7aed0b9faffdc33a.tar.gz
rails-fa6d921e11363e9b8c4bc10f7aed0b9faffdc33a.tar.bz2
rails-fa6d921e11363e9b8c4bc10f7aed0b9faffdc33a.zip
Remove blank trailing comments
For future reference, this is the regex I used: ^\s*#\s*\n(?!\s*#). Replace with the first match, and voilĂ ! Note that the regex matches a little bit too much, so you probably want to `git add -i .` and go through every single diff to check if it actually should be changed.
Diffstat (limited to 'activesupport/lib/active_support/message_encryptor.rb')
-rw-r--r--activesupport/lib/active_support/message_encryptor.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/message_encryptor.rb b/activesupport/lib/active_support/message_encryptor.rb
index ada2e79ccb..c002b1c02c 100644
--- a/activesupport/lib/active_support/message_encryptor.rb
+++ b/activesupport/lib/active_support/message_encryptor.rb
@@ -36,7 +36,6 @@ 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'