aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2018-10-02 16:04:23 -0400
committerRafael Mendonça França <rafaelmfranca@gmail.com>2018-10-02 16:04:23 -0400
commit92fece96da28d9f641bc8a8db1187b91c94cabfb (patch)
treeb42943a968ce869a9d716b1f798e861d7700bffb /activemodel/lib
parent59a6ba4bd585f53a02b118011599b835e47773ea (diff)
parentc401c43850e79a4d994e22dd8d82a69612bb947f (diff)
downloadrails-92fece96da28d9f641bc8a8db1187b91c94cabfb.tar.gz
rails-92fece96da28d9f641bc8a8db1187b91c94cabfb.tar.bz2
rails-92fece96da28d9f641bc8a8db1187b91c94cabfb.zip
Merge pull request #34051 from gmcgibbon/module_parent_method_rename
Prefix Module#parent, Module#parents, and Module#parent_name with module
Diffstat (limited to 'activemodel/lib')
-rw-r--r--activemodel/lib/active_model/naming.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activemodel/lib/active_model/naming.rb b/activemodel/lib/active_model/naming.rb
index 5f3d674c4e..bf23fa3c05 100644
--- a/activemodel/lib/active_model/naming.rb
+++ b/activemodel/lib/active_model/naming.rb
@@ -252,7 +252,7 @@ module ActiveModel
# Person.model_name.plural # => "people"
def model_name
@_model_name ||= begin
- namespace = parents.detect do |n|
+ namespace = module_parents.detect do |n|
n.respond_to?(:use_relative_model_naming?) && n.use_relative_model_naming?
end
ActiveModel::Name.new(self, namespace)