aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@plataformatec.com.br>2013-06-22 18:36:26 +0200
committerJosé Valim <jose.valim@plataformatec.com.br>2013-06-22 18:36:26 +0200
commite1f4f644344199bba7a060fe1ad27cde2e8d81e9 (patch)
tree866d7da3bfb2f9c8c0bc9c882fe0355586e2b91d /activemodel/lib
parent951bde4557cde3e1da8a5545031498c97a4e03f0 (diff)
downloadrails-e1f4f644344199bba7a060fe1ad27cde2e8d81e9.tar.gz
rails-e1f4f644344199bba7a060fe1ad27cde2e8d81e9.tar.bz2
rails-e1f4f644344199bba7a060fe1ad27cde2e8d81e9.zip
Revert "Merge pull request #11053 from yangchenyun/mine"
Those two files are required by active_support/rails.rb loaded in active_model.rb It is common to require common dependencies on the root files to avoid boilerplate in each file. This reverts commit 763635e30f17800ebc0a8ae98d780edc8ebfb4e5, reversing changes made to 4f46ef36aaef217834f3f96d3689d32f6a6761ea.
Diffstat (limited to 'activemodel/lib')
-rw-r--r--activemodel/lib/active_model/naming.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/activemodel/lib/active_model/naming.rb b/activemodel/lib/active_model/naming.rb
index e0241e761c..bc9edf4a56 100644
--- a/activemodel/lib/active_model/naming.rb
+++ b/activemodel/lib/active_model/naming.rb
@@ -1,7 +1,5 @@
require 'active_support/core_ext/hash/except'
require 'active_support/core_ext/module/introspection'
-require 'active_support/core_ext/module/delegation'
-require 'active_support/core_ext/object/blank'
module ActiveModel
class Name