diff options
| author | bogdanvlviv <bogdanvlviv@gmail.com> | 2019-01-17 01:06:35 +0000 |
|---|---|---|
| committer | bogdanvlviv <bogdanvlviv@gmail.com> | 2019-01-17 01:45:54 +0000 |
| commit | 4aa9935c2f8fbeeb4e123945eefb85f714372fb2 (patch) | |
| tree | 481c18647e84c9de2b9374596b7ed9e6024a86ea /railties | |
| parent | 481192171e67c2aad1dc4a3de113a61cca231674 (diff) | |
| download | rails-4aa9935c2f8fbeeb4e123945eefb85f714372fb2.tar.gz rails-4aa9935c2f8fbeeb4e123945eefb85f714372fb2.tar.bz2 rails-4aa9935c2f8fbeeb4e123945eefb85f714372fb2.zip | |
Add `config.credentials.content_path` and `config.credentials.key_path` to the guide
- Fix some typos
Follow up #33962
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG.md | 7 | ||||
| -rw-r--r-- | railties/lib/rails/commands/credentials/USAGE | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index 9c7e958b7c..f83ede5026 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -6,7 +6,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* @@ -14,7 +16,6 @@ *bogdanvlviv* - * Use original `bundler` environment variables during the process of generating a new rails project. *Marco Costa* @@ -141,7 +142,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: diff --git a/railties/lib/rails/commands/credentials/USAGE b/railties/lib/rails/commands/credentials/USAGE index d235592f46..c8d3fb9eda 100644 --- a/railties/lib/rails/commands/credentials/USAGE +++ b/railties/lib/rails/commands/credentials/USAGE @@ -42,7 +42,7 @@ from leaking. === Environment Specific Credentials The `credentials` command supports passing an `--environment` option to create an -environment specific override. That override will takes precedence over the +environment specific override. That override will take precedence over the global `config/credentials.yml.enc` file when running in that environment. So: rails credentials:edit --environment development @@ -54,5 +54,5 @@ doesn't exist. The encryption key can also be put in `ENV["RAILS_MASTER_KEY"]`, which takes precedence over the file encryption key. -In addition to that, the default credentials lookup paths can be overriden through +In addition to that, the default credentials lookup paths can be overridden through `config.credentials.content_path` and `config.credentials.key_path`. |