Merge branch 'master' into fix_26964

3 files changed, 6 insertions, 4 deletions

diff --git a/railties/lib/rails/commands/dbconsole/dbconsole_command.rb b/railties/lib/rails/commands/dbconsole/dbconsole_command.rb
index 35e8673215..588fb06b15 100644
--- a/railties/lib/rails/commands/dbconsole/dbconsole_command.rb
+++ b/railties/lib/rails/commands/dbconsole/dbconsole_command.rb
@@ -99,14 +99,14 @@ module Rails
       Rails.respond_to?(:env) ? Rails.env : Rails::Command.environment
     end
 
-    protected
-      def configurations
+    private
+      def configurations # :doc:
         require APP_PATH
         ActiveRecord::Base.configurations = Rails.application.config.database_configuration
         ActiveRecord::Base.configurations
       end
 
-      def find_cmd_and_exec(commands, *args)
+      def find_cmd_and_exec(commands, *args) # :doc:
         commands = Array(commands)
 
         dirs_on_path = ENV["PATH"].to_s.split(File::PATH_SEPARATOR)
diff --git a/railties/lib/rails/commands/generate/generate_command.rb b/railties/lib/rails/commands/generate/generate_command.rb
index 59b2febc43..aa8dab71b0 100644
--- a/railties/lib/rails/commands/generate/generate_command.rb
+++ b/railties/lib/rails/commands/generate/generate_command.rb
@@ -14,6 +14,8 @@ module Rails
         require_application_and_environment!
         load_generators
 
+        ARGV.shift
+
         Rails::Generators.invoke generator, args, behavior: :invoke, destination_root: Rails::Command.root
       end
     end
diff --git a/railties/lib/rails/commands/plugin/plugin_command.rb b/railties/lib/rails/commands/plugin/plugin_command.rb
index 16587ce067..b40ab006af 100644
--- a/railties/lib/rails/commands/plugin/plugin_command.rb
+++ b/railties/lib/rails/commands/plugin/plugin_command.rb
@@ -11,7 +11,7 @@ module Rails
         "#{executable} new [options]"
       end
 
-      class_option :rc, type: :boolean, default: File.join("~", ".railsrc"),
+      class_option :rc, type: :string, default: File.join("~", ".railsrc"),
         desc: "Initialize the plugin command with previous defaults. Uses .railsrc in your home directory by default."
 
       class_option :no_rc, desc: "Skip evaluating .railsrc."