aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-06-21 14:48:36 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-06-21 14:48:36 -0700
commita4cc79d0614ee334f4885309c22f1a56942de3f0 (patch)
treeb19f1a7dbd8bcf60d09e2d04ef7412cb456b3d12
parent6d71080530f8127b1a029f4314891c26e59446ce (diff)
parent1ce803d0910d57bfd8b40d5cdbf4bef650bad626 (diff)
downloadrails-a4cc79d0614ee334f4885309c22f1a56942de3f0.tar.gz
rails-a4cc79d0614ee334f4885309c22f1a56942de3f0.tar.bz2
rails-a4cc79d0614ee334f4885309c22f1a56942de3f0.zip
Merge pull request #6818 from frodsan/add_nodoc_instancemethod
add :nodoc: to AM::AttributeMethods#instance_method_already_implemented?...
-rw-r--r--activemodel/lib/active_model/attribute_methods.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activemodel/lib/active_model/attribute_methods.rb b/activemodel/lib/active_model/attribute_methods.rb
index 6e93fdd625..a5c9026886 100644
--- a/activemodel/lib/active_model/attribute_methods.rb
+++ b/activemodel/lib/active_model/attribute_methods.rb
@@ -258,7 +258,7 @@ module ActiveModel
end
protected
- def instance_method_already_implemented?(method_name)
+ def instance_method_already_implemented?(method_name) #:nodoc:
generated_attribute_methods.method_defined?(method_name)
end