diff options
| author | Yuji Yaginuma <yuuji.yaginuma@gmail.com> | 2018-02-08 19:49:50 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-08 19:49:50 +0900 |
| commit | 5d75ef72e61f00bbf987aa5a73e9ca2a1e23d718 (patch) | |
| tree | 9723c9838931817aefa7974d30e57e05c1ba5ca2 /railties/lib/rails/commands/credentials | |
| parent | cc523fba9baf09849aeb59db28dab04135839f34 (diff) | |
| download | rails-5d75ef72e61f00bbf987aa5a73e9ca2a1e23d718.tar.gz rails-5d75ef72e61f00bbf987aa5a73e9ca2a1e23d718.tar.bz2 rails-5d75ef72e61f00bbf987aa5a73e9ca2a1e23d718.zip | |
Do not add master key when `RAILS_MASTER_KEY` env specified (#31922)
Fixes #31917
Diffstat (limited to 'railties/lib/rails/commands/credentials')
| -rw-r--r-- | railties/lib/rails/commands/credentials/credentials_command.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/commands/credentials/credentials_command.rb b/railties/lib/rails/commands/credentials/credentials_command.rb index 385d3976da..fa54c0362a 100644 --- a/railties/lib/rails/commands/credentials/credentials_command.rb +++ b/railties/lib/rails/commands/credentials/credentials_command.rb @@ -20,7 +20,7 @@ module Rails require_application_and_environment! ensure_editor_available(command: "bin/rails credentials:edit") || (return) - ensure_master_key_has_been_added + ensure_master_key_has_been_added if Rails.application.credentials.key.nil? ensure_credentials_have_been_added catch_editing_exceptions do |