diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2017-02-23 15:55:15 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-23 15:55:15 +0100 |
commit | 039380e3eeb24ed17f1824183b94638f0cfff747 (patch) | |
tree | 043922cdcb7298443aac11f594c412404a299fe9 /railties/lib/rails/command/base.rb | |
parent | 11660945696155c86a05260795e1a0afce0d291d (diff) | |
download | rails-039380e3eeb24ed17f1824183b94638f0cfff747.tar.gz rails-039380e3eeb24ed17f1824183b94638f0cfff747.tar.bz2 rails-039380e3eeb24ed17f1824183b94638f0cfff747.zip |
Revert "Add encrypted secrets" (#28127)
Diffstat (limited to 'railties/lib/rails/command/base.rb')
-rw-r--r-- | railties/lib/rails/command/base.rb | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/railties/lib/rails/command/base.rb b/railties/lib/rails/command/base.rb index db20c71861..1435792536 100644 --- a/railties/lib/rails/command/base.rb +++ b/railties/lib/rails/command/base.rb @@ -56,9 +56,7 @@ module Rails end def perform(command, args, config) # :nodoc: - if Rails::Command::HELP_MAPPINGS.include?(args.first) - command, args = "help", [] - end + command = nil if Rails::Command::HELP_MAPPINGS.include?(args.first) dispatch(command, args.dup, nil, config) end @@ -113,7 +111,7 @@ module Rails # For a `Rails::Command::TestCommand` placed in `rails/command/test_command.rb` # would return `rails/test`. def default_command_root - path = File.expand_path(File.join("../commands", command_root_namespace), __dir__) + path = File.expand_path(File.join("../commands", command_name), __dir__) path if File.exist?(path) end @@ -131,10 +129,6 @@ module Rails super end end - - def command_root_namespace - (namespace.split(":") - %w( rails )).first - end end def help |