aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2013-06-22 03:32:15 -0700
committerYves Senn <yves.senn@gmail.com>2013-06-22 03:32:15 -0700
commit763635e30f17800ebc0a8ae98d780edc8ebfb4e5 (patch)
tree336a39007cc21443ef211f7811aa6b72b8301553 /activemodel
parent4f46ef36aaef217834f3f96d3689d32f6a6761ea (diff)
parentc20b5ca037ee788c547705bf451f88bc5352ce12 (diff)
downloadrails-763635e30f17800ebc0a8ae98d780edc8ebfb4e5.tar.gz
rails-763635e30f17800ebc0a8ae98d780edc8ebfb4e5.tar.bz2
rails-763635e30f17800ebc0a8ae98d780edc8ebfb4e5.zip
Merge pull request #11053 from yangchenyun/mine
Add explicit dependencies of ActiveSupport to enable independent usage of ActiveModel::Name
Diffstat (limited to 'activemodel')
-rw-r--r--activemodel/lib/active_model/naming.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/activemodel/lib/active_model/naming.rb b/activemodel/lib/active_model/naming.rb
index bc9edf4a56..e0241e761c 100644
--- a/activemodel/lib/active_model/naming.rb
+++ b/activemodel/lib/active_model/naming.rb
@@ -1,5 +1,7 @@
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