Merge pull request #11300 from arunagw/railties-engine-deprecation-removed

Removed deprecated `Rails.application.railties.engines`.

3 files changed, 4 insertions, 12 deletions

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 2a0119a3b2..b80aa944e0 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Removed deprecated `Rails.application.railties.engines`.
+
+    *Arun Agrawal*
+
 *   Removed deprecated threadsafe! from Rails Config.
 
     *Paul Nikitochkin*
diff --git a/railties/lib/rails/engine/railties.rb b/railties/lib/rails/engine/railties.rb
index 1081700cd0..595256f36a 100644
--- a/railties/lib/rails/engine/railties.rb
+++ b/railties/lib/rails/engine/railties.rb
@@ -9,10 +9,6 @@ module Rails
           ::Rails::Engine.subclasses.map(&:instance)
       end
 
-      def self.engines
-        @engines ||= ::Rails::Engine.subclasses.map(&:instance)
-      end
-
       def each(*args, &block)
         _all.each(*args, &block)
       end
@@ -25,5 +21,3 @@ module Rails
     end
   end
 end
-
-ActiveSupport::Deprecation.deprecate_methods(Rails::Engine::Railties, :engines)
diff --git a/railties/test/railties/engine_test.rb b/railties/test/railties/engine_test.rb
index 50253fe2bc..d095535abd 100644
--- a/railties/test/railties/engine_test.rb
+++ b/railties/test/railties/engine_test.rb
@@ -1236,12 +1236,6 @@ YAML
       assert_equal '/foo/bukkits/bukkit', last_response.body
     end
 
-    test "engines method is properly deprecated" do
-      boot_rails
-
-      assert_deprecated { app.railties.engines }
-    end
-
   private
     def app
       Rails.application