diff options
| author | Andrew White <pixeltrix@users.noreply.github.com> | 2018-03-31 15:48:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-31 15:48:32 +0100 |
| commit | f339b098b20c7f6675d375cfa29828a911fe1b53 (patch) | |
| tree | 60f6f63f31d52130933f7b1665bd301c254f91d2 /railties/lib | |
| parent | cbb054a0a9fb2a065254b026cf4d67763a39432d (diff) | |
| parent | 7419a4f911b2f8521db3ecfcd78148cf89ebd221 (diff) | |
| download | rails-f339b098b20c7f6675d375cfa29828a911fe1b53.tar.gz rails-f339b098b20c7f6675d375cfa29828a911fe1b53.tar.bz2 rails-f339b098b20c7f6675d375cfa29828a911fe1b53.zip | |
Merge pull request #32394 from yskkin/key_generator
Deriving `secret_key_base` breaks `key_generator` defined in 5.1.
Diffstat (limited to 'railties/lib')
| -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 a9dee10981..e346d5cc3a 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -427,7 +427,7 @@ module Rails # the correct place to store it is in the encrypted credentials file. def secret_key_base if Rails.env.test? || Rails.env.development? - Digest::MD5.hexdigest self.class.name + secrets.secret_key_base || Digest::MD5.hexdigest(self.class.name) else validate_secret_key_base( ENV["SECRET_KEY_BASE"] || credentials.secret_key_base || secrets.secret_key_base |