diff options
| author | Mingdong Luo <mdluo@nsmss.com> | 2015-01-31 19:23:48 -0800 |
|---|---|---|
| committer | Mingdong Luo <mdluo@nsmss.com> | 2015-01-31 19:23:48 -0800 |
| commit | 549d171a90135999e3c670f489494b7a39dd6dd7 (patch) | |
| tree | 233466527b797fe3ea7c6a7a3673795cea28aebe /activesupport/lib/active_support.rb | |
| parent | c840b18ac31a852d99ff760229f2c087b6961727 (diff) | |
| parent | 70ac072976c8cc6f013f0df3777e54ccae3f4f8c (diff) | |
| download | rails-549d171a90135999e3c670f489494b7a39dd6dd7.tar.gz rails-549d171a90135999e3c670f489494b7a39dd6dd7.tar.bz2 rails-549d171a90135999e3c670f489494b7a39dd6dd7.zip | |
Merge branch 'master' into pr/18316
Conflicts:
activerecord/CHANGELOG.md
Diffstat (limited to 'activesupport/lib/active_support.rb')
| -rw-r--r-- | activesupport/lib/active_support.rb | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb index 2c327244cc..290920dbf8 100644 --- a/activesupport/lib/active_support.rb +++ b/activesupport/lib/active_support.rb @@ -71,15 +71,7 @@ module ActiveSupport NumberHelper.eager_load! end - @@test_order = nil - - def self.test_order=(new_order) # :nodoc: - @@test_order = new_order - end - - def self.test_order # :nodoc: - @@test_order - end + cattr_accessor :test_order # :nodoc: end autoload :I18n, "active_support/i18n" |