kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Relocate require in AS::Deprecation

Browse source 
Without this, it's possible to encounter:
NoMethodError: undefined method `on_jruby?' for Concurrent:Module

See also https://github.com/ruby-concurrency/concurrent-ruby/pull/833
This commit is contained in:
Peter Wagenet 2019-11-13 07:12:15 -08:00
parent 3ab43e7e4e
commit 169b70ae62
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
activesupport/lib/active_support/deprecation.rb
View file

@ -1,7 +1,6 @@
# frozen_string_literal: true # frozen_string_literal: true
require "singleton" require "singleton"
require "concurrent/atomic/thread_local_var"
module ActiveSupport module ActiveSupport
# \Deprecation specifies the API used by Rails to deprecate methods, instance # \Deprecation specifies the API used by Rails to deprecate methods, instance
@ -22,6 +21,7 @@ module ActiveSupport
require "active_support/deprecation/method_wrappers" require "active_support/deprecation/method_wrappers"
require "active_support/deprecation/proxy_wrappers" require "active_support/deprecation/proxy_wrappers"
require "active_support/core_ext/module/deprecation" require "active_support/core_ext/module/deprecation"
require "concurrent/atomic/thread_local_var"
include Singleton include Singleton
include InstanceDelegator include InstanceDelegator