Merge pull request #27706 from y-yagi/allow_to_pass_describe_option_to_rake

allow to pass describe option to rake

2 files changed, 4 insertions, 2 deletions

diff --git a/railties/lib/rails/command.rb b/railties/lib/rails/command.rb
index 9012ceb274..13f3b90b6d 100644
--- a/railties/lib/rails/command.rb
+++ b/railties/lib/rails/command.rb
@@ -15,6 +15,8 @@ module Rails
 
     include Behavior
 
+    HELP_MAPPINGS = %w(-h -? --help)
+
     class << self
       def hidden_commands # :nodoc:
         @hidden_commands ||= []
@@ -27,7 +29,7 @@ module Rails
       # Receives a namespace, arguments and the behavior to invoke the command.
       def invoke(namespace, args = [], **config)
         namespace = namespace.to_s
-        namespace = "help" if namespace.blank? || Thor::HELP_MAPPINGS.include?(namespace)
+        namespace = "help" if namespace.blank? || HELP_MAPPINGS.include?(namespace)
         namespace = "version" if %w( -v --version ).include? namespace
 
         if command = find_by_namespace(namespace)
diff --git a/railties/lib/rails/command/base.rb b/railties/lib/rails/command/base.rb
index 7ae190433a..1435792536 100644
--- a/railties/lib/rails/command/base.rb
+++ b/railties/lib/rails/command/base.rb
@@ -56,7 +56,7 @@ module Rails
         end
 
         def perform(command, args, config) # :nodoc:
-          command = nil if Thor::HELP_MAPPINGS.include?(args.first)
+          command = nil if Rails::Command::HELP_MAPPINGS.include?(args.first)
 
           dispatch(command, args.dup, nil, config)
         end