diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2019-08-04 02:19:55 +0200 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2019-08-04 02:19:55 +0200 |
| commit | f1f5024b918ecf303b9908f78d1a6136d9418730 (patch) | |
| tree | 2e35bb48205daddbf6c5f02fdfbf8a39ffa23867 /railties/lib/rails/commands/credentials/credentials_command.rb | |
| parent | 03e44f93001db97953917e0a100c627e189e2be6 (diff) | |
| download | rails-f1f5024b918ecf303b9908f78d1a6136d9418730.tar.gz rails-f1f5024b918ecf303b9908f78d1a6136d9418730.tar.bz2 rails-f1f5024b918ecf303b9908f78d1a6136d9418730.zip | |
Revise flow to what was described in 03e44f9
Diffstat (limited to 'railties/lib/rails/commands/credentials/credentials_command.rb')
| -rw-r--r-- | railties/lib/rails/commands/credentials/credentials_command.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/railties/lib/rails/commands/credentials/credentials_command.rb b/railties/lib/rails/commands/credentials/credentials_command.rb index 9b3a7dbb86..9cde44558b 100644 --- a/railties/lib/rails/commands/credentials/credentials_command.rb +++ b/railties/lib/rails/commands/credentials/credentials_command.rb @@ -32,6 +32,7 @@ module Rails ensure_encryption_key_has_been_added if credentials.key.nil? ensure_credentials_have_been_added + ensure_rails_credentials_driver_is_set catch_editing_exceptions do change_credentials_in_system_editor @@ -49,8 +50,8 @@ module Rails say credentials.read.presence || missing_credentials_message end - option :enable, type: :boolean, default: false, - desc: "Pass `--enable` to make credential files diffable with `git diff`" + option :enroll, type: :boolean, default: false, + desc: "Enrolls project in credential file diffing with `git diff`" def diff(content_path = nil) if @content_path = content_path @@ -60,7 +61,7 @@ module Rails say credentials.read.presence || credentials.content_path.read else require_application! - enable_diffing if options[:enable] + enroll_project_in_credentials_diffing if options[:enroll] end rescue ActiveSupport::MessageEncryptor::InvalidMessage say credentials.content_path.read |