aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/inflections.rb
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2012-06-29 21:29:14 +0200
committerXavier Noria <fxn@hashref.com>2012-06-29 21:29:14 +0200
commit58c83d4c6108a67ee0cf2de4ed8ea91953f98d2d (patch)
treed971d93fb372fc6b16ebe2a6e71b9b23f16d86ba /activesupport/lib/active_support/inflections.rb
parent33192cfa07d82e345910cdb279f15305ad463faa (diff)
downloadrails-58c83d4c6108a67ee0cf2de4ed8ea91953f98d2d.tar.gz
rails-58c83d4c6108a67ee0cf2de4ed8ea91953f98d2d.tar.bz2
rails-58c83d4c6108a67ee0cf2de4ed8ea91953f98d2d.zip
make sure the inflection rules are loaded when cherry-picking active_support/core_ext/string/inflections.rb [fixes #6884]
Diffstat (limited to 'activesupport/lib/active_support/inflections.rb')
-rw-r--r--activesupport/lib/active_support/inflections.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/inflections.rb b/activesupport/lib/active_support/inflections.rb
index c04c2ed15b..ca2d8cb270 100644
--- a/activesupport/lib/active_support/inflections.rb
+++ b/activesupport/lib/active_support/inflections.rb
@@ -1,3 +1,5 @@
+require 'active_support/inflector/inflections'
+
module ActiveSupport
Inflector.inflections do |inflect|
inflect.plural(/$/, 's')