aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2012-03-08 23:26:48 -0800
committerJosé Valim <jose.valim@gmail.com>2012-03-08 23:26:48 -0800
commit225eff9d61d2bcea5cbe8c30a03f404fab239f18 (patch)
tree4fcf225fe320432b00b650ff2a53ec2be1ab865e /activemodel
parentba35527fe7b0baa07d64731b2c8251f66616904c (diff)
parent2b97b8fb9e648aa866e42e8f386bf1bcee89e071 (diff)
downloadrails-225eff9d61d2bcea5cbe8c30a03f404fab239f18.tar.gz
rails-225eff9d61d2bcea5cbe8c30a03f404fab239f18.tar.bz2
rails-225eff9d61d2bcea5cbe8c30a03f404fab239f18.zip
Merge pull request #5351 from shanna/master
Missing active_model/naming.rb dependency.
Diffstat (limited to 'activemodel')
-rw-r--r--activemodel/lib/active_model/naming.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activemodel/lib/active_model/naming.rb b/activemodel/lib/active_model/naming.rb
index 755e54efcd..fd0bc4e8e9 100644
--- a/activemodel/lib/active_model/naming.rb
+++ b/activemodel/lib/active_model/naming.rb
@@ -2,6 +2,7 @@ require 'active_support/inflector'
require 'active_support/core_ext/hash/except'
require 'active_support/core_ext/module/introspection'
require 'active_support/core_ext/module/deprecation'
+require 'active_support/core_ext/object/blank'
module ActiveModel
class Name < String