3 files changed, 4 insertions, 6 deletions
diff --git a/railties/lib/rails/engine/railties.rb b/railties/lib/rails/engine/railties.rb
index 595256f36a..9969a1475d 100644
--- a/railties/lib/rails/engine/railties.rb
+++ b/railties/lib/rails/engine/railties.rb
@@ -16,8 +16,6 @@ module Rails
       def -(others)
         _all - others
       end
-
-      delegate :engines, to: "self.class"
     end
   end
 end
diff --git a/railties/lib/rails/generators/rails/controller/controller_generator.rb b/railties/lib/rails/generators/rails/controller/controller_generator.rb
index 822f35fb42..ef84447df9 100644
--- a/railties/lib/rails/generators/rails/controller/controller_generator.rb
+++ b/railties/lib/rails/generators/rails/controller/controller_generator.rb
@@ -32,18 +32,18 @@ module Rails
           # namespace :foo do
           #   namespace :bar do
           namespace_ladder = class_path.each_with_index.map do |ns, i|
-            %{#{" " * i * 2}namespace :#{ns} do\n  }
+            indent("namespace :#{ns} do\n", i * 2)
           end.join
 
           # Create route
           #     get "baz/index"
-          route = %{#{" " * depth * 2}get "#{file_name}/#{action}"\n}
+          route = indent(%{get "#{file_name}/#{action}"\n}, depth * 2)
 
           # Create `end` ladder
           #   end
           # end
           end_ladder = (1..depth).reverse_each.map do |i|
-            "#{" " * i * 2}end\n"
+            indent("end\n", i * 2)
           end.join
 
           # Combine the 3 parts to generate complete route entry
diff --git a/railties/lib/rails/railtie/configuration.rb b/railties/lib/rails/railtie/configuration.rb
index 0cbbf04da2..eb3b2d8ef4 100644
--- a/railties/lib/rails/railtie/configuration.rb
+++ b/railties/lib/rails/railtie/configuration.rb
@@ -80,7 +80,7 @@ module Rails
         to_prepare_blocks << blk if blk
       end
 
-      def respond_to?(name)
+      def respond_to?(name, include_private = false)
         super || @@options.key?(name.to_sym)
       end