diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2014-04-07 16:53:58 -0300 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2014-04-07 16:53:58 -0300 |
| commit | 70c83f49f8fcefdf52c2ed22706a14e29559cea5 (patch) | |
| tree | 965f984280f32a59d8132702974dd3c76e1df939 /railties/lib/rails | |
| parent | 6bbbe0b6513d7452cba43680f0da8362b98d4ca5 (diff) | |
| download | rails-70c83f49f8fcefdf52c2ed22706a14e29559cea5.tar.gz rails-70c83f49f8fcefdf52c2ed22706a14e29559cea5.tar.bz2 rails-70c83f49f8fcefdf52c2ed22706a14e29559cea5.zip | |
Remove useless begin..end
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/application.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index dd650e9631..4be90a3f6c 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -151,14 +151,13 @@ module Rails def key_generator # number of iterations selected based on consultation with the google security # team. Details at https://github.com/rails/rails/pull/6952#issuecomment-7661220 - @caching_key_generator ||= begin + @caching_key_generator ||= if secrets.secret_key_base key_generator = ActiveSupport::KeyGenerator.new(secrets.secret_key_base, iterations: 1000) ActiveSupport::CachingKeyGenerator.new(key_generator) else ActiveSupport::LegacyKeyGenerator.new(config.secret_token) end - end end # Returns a message verifier object. |