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:31:09 +0200
commit9e0b3fc7cfba43af55377488f991348e2de24515 (patch)
treefa173829cdd65b07ed5faf0d589b68f7afd05d1d /activesupport/lib/active_support/inflections.rb
parent48601c27b7942a18482bc817321a1ce9effece20 (diff)
downloadrails-9e0b3fc7cfba43af55377488f991348e2de24515.tar.gz
rails-9e0b3fc7cfba43af55377488f991348e2de24515.tar.bz2
rails-9e0b3fc7cfba43af55377488f991348e2de24515.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 527cce2594..23a8e68c21 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')