diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2017-04-16 16:17:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-16 16:17:06 +0200 |
| commit | eda40e1f28c1eb1469e87f1439333d5fed3db081 (patch) | |
| tree | f9ee9601e28bc29936928ed123d877de01406284 /railties/lib/rails/application.rb | |
| parent | 066e5d62d5e83830040083b5f34c9da8bed0ba4f (diff) | |
| parent | 827bfe4f41c39eade078e26ad5653979891d89c7 (diff) | |
| download | rails-eda40e1f28c1eb1469e87f1439333d5fed3db081.tar.gz rails-eda40e1f28c1eb1469e87f1439333d5fed3db081.tar.bz2 rails-eda40e1f28c1eb1469e87f1439333d5fed3db081.zip | |
Merge pull request #28631 from y-yagi/fix_28618
Use the config value directly when call `secrets`
Diffstat (limited to 'railties/lib/rails/application.rb')
| -rw-r--r-- | railties/lib/rails/application.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index 89f7b5991f..f8a923141d 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -386,7 +386,9 @@ module Rails def secrets @secrets ||= begin secrets = ActiveSupport::OrderedOptions.new - secrets.merge! Rails::Secrets.parse(config.paths["config/secrets"].existent, env: Rails.env) + files = config.paths["config/secrets"].existent + files = files.reject { |path| path.end_with?(".enc") } unless config.read_encrypted_secrets + secrets.merge! Rails::Secrets.parse(files, env: Rails.env) # Fallback to config.secret_key_base if secrets.secret_key_base isn't set secrets.secret_key_base ||= config.secret_key_base |