diff options
author | Kasper Timm Hansen <kaspth@gmail.com> | 2019-03-11 21:08:20 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-11 21:08:20 +0100 |
commit | 3a42c2305eccb8d54e66c76eb2ae4eacfd81f941 (patch) | |
tree | 6bb5b9975cecff795f4b7d467c14491bd2a83466 /railties/CHANGELOG.md | |
parent | f55306f098f9a937ef2b0fbbb0e002960f7bcf89 (diff) | |
parent | 4aa9935c2f8fbeeb4e123945eefb85f714372fb2 (diff) | |
download | rails-3a42c2305eccb8d54e66c76eb2ae4eacfd81f941.tar.gz rails-3a42c2305eccb8d54e66c76eb2ae4eacfd81f941.tar.bz2 rails-3a42c2305eccb8d54e66c76eb2ae4eacfd81f941.zip |
Merge pull request #34955 from bogdanvlviv/follow-up-33962
Add `config.credentials.content_path` and `config.credentials.key_path` to the guide
Diffstat (limited to 'railties/CHANGELOG.md')
-rw-r--r-- | railties/CHANGELOG.md | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index 88f9ac06f6..d2377b3b6d 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -44,7 +44,9 @@ gsub Gemfile ``` - The change command copies a template `config/database.yml` with the target database adapter into your app, and replaces your database gem with the target database gem. + The change command copies a template `config/database.yml` with + the target database adapter into your app, and replaces your database gem + with the target database gem. *Gannon McGibbon* @@ -178,7 +180,7 @@ The encryption key can be in `ENV["RAILS_MASTER_KEY"]` or `config/credentials/production.key`. Environment credentials overrides can be edited with `rails credentials:edit --environment production`. - If no override is setup for the passed environment, it will be created. + If no override is set up for the passed environment, it will be created. Additionally, the default lookup paths can be overwritten with these configs: |