Merge pull request #43303 from etiennebarrie/dont-patch-object-for-fo…

…rk-in-ruby3 Don't patch Object for fork in Ruby 3.0
rails · Sep 24, 2021 · 1268b9a · 1268b9a
2 parents 581aac7 + 5bf6073
commit 1268b9a
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/activesupport/lib/active_support/fork_tracker.rb b/activesupport/lib/active_support/fork_tracker.rb
@@ -20,11 +20,7 @@ def fork(...)
 
     module CoreExtPrivate
       include CoreExt
-
-      private
-        def fork(...)
-          super
-        end
+      private :fork
     end
 
     @pid = Process.pid
@@ -40,7 +36,7 @@ def check!
 
       def hook!
         if Process.respond_to?(:fork)
-          ::Object.prepend(CoreExtPrivate)
+          ::Object.prepend(CoreExtPrivate) if RUBY_VERSION < "3.0"
           ::Kernel.prepend(CoreExtPrivate)
           ::Kernel.singleton_class.prepend(CoreExt)
           ::Process.singleton_class.prepend(CoreExt)