diff options
| author | Alberto Almagro <albertoalmagro@gmail.com> | 2018-06-26 22:02:51 +0200 |
|---|---|---|
| committer | Alberto Almagro <albertoalmagro@gmail.com> | 2018-07-06 22:46:35 +0200 |
| commit | 40b209db53796ae515387d0fee2a525872eb2ae4 (patch) | |
| tree | 604a386af44a319c9cb136b9e1e260e7c59a4d7c /railties/lib/rails/commands/credentials | |
| parent | a0061d2389a178b093f0d3f64f58236ffbe088e0 (diff) | |
| download | rails-40b209db53796ae515387d0fee2a525872eb2ae4.tar.gz rails-40b209db53796ae515387d0fee2a525872eb2ae4.tar.bz2 rails-40b209db53796ae515387d0fee2a525872eb2ae4.zip | |
Recommend use of rails over bin/rails
As discussed in #33203 rails command already looks for, and runs,
bin/rails if it is present.
We were mixing recommendations within guides and USAGE guidelines,
in some files we recommended using rails, in others bin/rails and
in some cases we even had both options mixed together.
Diffstat (limited to 'railties/lib/rails/commands/credentials')
| -rw-r--r-- | railties/lib/rails/commands/credentials/USAGE | 2 | ||||
| -rw-r--r-- | railties/lib/rails/commands/credentials/credentials_command.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/railties/lib/rails/commands/credentials/USAGE b/railties/lib/rails/commands/credentials/USAGE index 85877c71b7..ea429f58d8 100644 --- a/railties/lib/rails/commands/credentials/USAGE +++ b/railties/lib/rails/commands/credentials/USAGE @@ -14,7 +14,7 @@ that just contains the secret_key_base used by MessageVerifiers/MessageEncryptor signing and encrypting cookies. For applications created prior to Rails 5.2, we'll automatically generate a new -credentials file in `config/credentials.yml.enc` the first time you run `bin/rails credentials:edit`. +credentials file in `config/credentials.yml.enc` the first time you run `rails credentials:edit`. If you didn't have a master key saved in `config/master.key`, that'll be created too. Don't lose this master key! Put it in a password manager your team can access. diff --git a/railties/lib/rails/commands/credentials/credentials_command.rb b/railties/lib/rails/commands/credentials/credentials_command.rb index fa54c0362a..65c5218fc8 100644 --- a/railties/lib/rails/commands/credentials/credentials_command.rb +++ b/railties/lib/rails/commands/credentials/credentials_command.rb @@ -69,9 +69,9 @@ module Rails def missing_credentials_message if Rails.application.credentials.key.nil? - "Missing master key to decrypt credentials. See bin/rails credentials:help" + "Missing master key to decrypt credentials. See `rails credentials:help`" else - "No credentials have been added yet. Use bin/rails credentials:edit to change that." + "No credentials have been added yet. Use `rails credentials:edit` to change that." end end end |