diff options
| author | Matthew Draper <matthew@trebex.net> | 2014-07-02 00:18:14 +0930 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2014-07-02 00:18:14 +0930 |
| commit | 5de61ccb4ad5136d9f71097ab3b551c3cb8f753e (patch) | |
| tree | 9d7a68f43f55f74d6a8ce0c4043294df7f0702ab | |
| parent | d15d1a0d744e304ffd0cb3f3dec0fd52d33df1fd (diff) | |
| parent | fa03fa773528da88ed7c6eb6826530423c7526b2 (diff) | |
| download | rails-5de61ccb4ad5136d9f71097ab3b551c3cb8f753e.tar.gz rails-5de61ccb4ad5136d9f71097ab3b551c3cb8f753e.tar.bz2 rails-5de61ccb4ad5136d9f71097ab3b551c3cb8f753e.zip | |
Merge pull request #16000 from sgrif/sg-silence-warning
Silence warning emitted in tests
| -rw-r--r-- | activemodel/lib/active_model/naming.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activemodel/lib/active_model/naming.rb b/activemodel/lib/active_model/naming.rb index 8cf1a191f4..86f5c96af9 100644 --- a/activemodel/lib/active_model/naming.rb +++ b/activemodel/lib/active_model/naming.rb @@ -216,6 +216,7 @@ module ActiveModel module Naming def self.extended(base) #:nodoc: base.class_eval do + remove_possible_method(:model_name) delegate :model_name, to: :class end end |