diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-06-12 13:23:15 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-06-12 13:23:15 -0300 |
| commit | 8beb328befa53d74fe9c7942ddb188563bd4de33 (patch) | |
| tree | f2c602493b4919e6c696855b171994b5fd847e1e /activesupport/lib | |
| parent | 1d43458c148f9532a81b92ee3a247da4f1c0b7ad (diff) | |
| parent | f98e75a3e2b1665bd1da28b9456a296cc3c35bbc (diff) | |
| download | rails-8beb328befa53d74fe9c7942ddb188563bd4de33.tar.gz rails-8beb328befa53d74fe9c7942ddb188563bd4de33.tar.bz2 rails-8beb328befa53d74fe9c7942ddb188563bd4de33.zip | |
Merge pull request #20494 from knovoselic/active_support_concern_class_methods_fix
[ActiveSupport] Fix for #20489 - ActiveSupport::Concern#class_methods affects parent classes
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/concern.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/concern.rb b/activesupport/lib/active_support/concern.rb index 4082d2d464..0403eb70ca 100644 --- a/activesupport/lib/active_support/concern.rb +++ b/activesupport/lib/active_support/concern.rb @@ -132,7 +132,7 @@ module ActiveSupport end def class_methods(&class_methods_module_definition) - mod = const_defined?(:ClassMethods) ? + mod = const_defined?(:ClassMethods, false) ? const_get(:ClassMethods) : const_set(:ClassMethods, Module.new) |