diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-12-31 21:05:07 -0200 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-12-31 21:05:07 -0200 |
commit | ec466998387453203444f4c6a24eb92eb204d27a (patch) | |
tree | 99cbabe125ce34530ca4bb8c4f5578b3cbf7a65b /activemodel/lib/active_model/serialization.rb | |
parent | 13c18fe2cab630798bd8f7946bc2646f0d295c7f (diff) | |
parent | b5fdeaac557925830210d26b00f30dccfa802127 (diff) | |
download | rails-ec466998387453203444f4c6a24eb92eb204d27a.tar.gz rails-ec466998387453203444f4c6a24eb92eb204d27a.tar.bz2 rails-ec466998387453203444f4c6a24eb92eb204d27a.zip |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'activemodel/lib/active_model/serialization.rb')
-rw-r--r-- | activemodel/lib/active_model/serialization.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activemodel/lib/active_model/serialization.rb b/activemodel/lib/active_model/serialization.rb index fdb06aebb9..36a6c00290 100644 --- a/activemodel/lib/active_model/serialization.rb +++ b/activemodel/lib/active_model/serialization.rb @@ -128,7 +128,7 @@ module ActiveModel # retrieve the value for a given attribute differently: # # class MyClass - # include ActiveModel::Validations + # include ActiveModel::Serialization # # def initialize(data = {}) # @data = data |