diff options
| author | Godfrey Chan <godfreykfc@gmail.com> | 2015-04-12 10:04:16 -0700 |
|---|---|---|
| committer | Godfrey Chan <godfreykfc@gmail.com> | 2015-04-12 10:04:16 -0700 |
| commit | 4825042a1c8d5527a7da468937d03f7e07362ce1 (patch) | |
| tree | c7e1d2f771bb68b3af5bd9abe7bd5da19072a15d /railties | |
| parent | efaec3dd63df113c7931f84d6b1d80f26307d93c (diff) | |
| parent | b93ae0cd56054299d5645bd3572af0b495c304dd (diff) | |
| download | rails-4825042a1c8d5527a7da468937d03f7e07362ce1.tar.gz rails-4825042a1c8d5527a7da468937d03f7e07362ce1.tar.bz2 rails-4825042a1c8d5527a7da468937d03f7e07362ce1.zip | |
Merge pull request #19735 from Dan-Burnette/fixSecretKeyBaseErrorMessage
Error message no longer tells you to set the (deprecated) secret_token.
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/application.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index e9683d4a95..3e3ef72742 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -511,7 +511,7 @@ module Rails "Read the upgrade documentation to learn more about this new config option." if secrets.secret_token.blank? - raise "Missing `secret_token` and `secret_key_base` for '#{Rails.env}' environment, set these values in `config/secrets.yml`" + raise "Missing `secret_key_base` for '#{Rails.env}' environment, set this value in `config/secrets.yml`" end end end |