diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-04-23 14:34:37 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-04-23 14:34:37 +0100 |
| commit | ae812c0a7bdb876c03752adfaa980ac4e74f2e17 (patch) | |
| tree | 73eba5b0ddce60a4578fcbf6be581b8f35488273 /activesupport/lib/active_support/json/encoders/regexp.rb | |
| parent | 67f30fd9639409877a57a7ba758cd13496433d69 (diff) | |
| parent | 3c4c6bd0df598f865f49a983b4c65c415af4bcfc (diff) | |
| download | rails-ae812c0a7bdb876c03752adfaa980ac4e74f2e17.tar.gz rails-ae812c0a7bdb876c03752adfaa980ac4e74f2e17.tar.bz2 rails-ae812c0a7bdb876c03752adfaa980ac4e74f2e17.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to 'activesupport/lib/active_support/json/encoders/regexp.rb')
| -rw-r--r-- | activesupport/lib/active_support/json/encoders/regexp.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/json/encoders/regexp.rb b/activesupport/lib/active_support/json/encoders/regexp.rb index b6116b70b5..63ccd7c490 100644 --- a/activesupport/lib/active_support/json/encoders/regexp.rb +++ b/activesupport/lib/active_support/json/encoders/regexp.rb @@ -1,5 +1,7 @@ class Regexp - def to_json(options = nil) #:nodoc: + def rails_to_json(options = nil) #:nodoc: inspect end + + alias to_json rails_to_json end |