diff options
| author | Rafael Mendonça França <rafael.franca@plataformatec.com.br> | 2014-11-10 21:18:57 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafael.franca@plataformatec.com.br> | 2014-11-10 21:18:57 -0200 |
| commit | 1d1239d32856b32b19c04edd17d0dd0d47611586 (patch) | |
| tree | 5f232f5e7b4d938c64b467f769ee8e455f5cad6e /railties/lib | |
| parent | 091652cae8465711de3c12697a93c67a9f94576c (diff) | |
| download | rails-1d1239d32856b32b19c04edd17d0dd0d47611586.tar.gz rails-1d1239d32856b32b19c04edd17d0dd0d47611586.tar.bz2 rails-1d1239d32856b32b19c04edd17d0dd0d47611586.zip | |
No need to sync config.secret_token and secrets.secret_token
Just prefer secrets over config
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/application.rb | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index ae60337af2..f8bd6096f2 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -381,13 +381,8 @@ module Rails # Fallback to config.secret_key_base if secrets.secret_key_base isn't set secrets.secret_key_base ||= config.secret_key_base - # Sync secrets.secret_token with config.secret_token, preferring secrets.secret_token - # note that unset config's default to "", secrets default to nil - if secrets.secret_token.blank? && config.secret_token.present? - secrets.secret_token = config.secret_token - elsif secrets.secret_token.present? - config.secret_token = secrets.secret_token - end + # Fallback to config.secret_token if secrets.secret_token isn't set + secrets.secret_token ||= config.secret_token secrets end |