diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-06-07 15:44:57 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-06-07 15:44:57 +0200 |
| commit | 9e065c6bc175621ad30a416c8c4345f95ce3c264 (patch) | |
| tree | 505df4243727a00d1f030205f2e64afe0d098e5e /activemodel | |
| parent | 0dbc732995a526354fb1e3c732af5dacdb863dda (diff) | |
| parent | 1a8f784a236058101c6e8b6387aefc96e86a1e54 (diff) | |
| download | rails-9e065c6bc175621ad30a416c8c4345f95ce3c264.tar.gz rails-9e065c6bc175621ad30a416c8c4345f95ce3c264.tar.bz2 rails-9e065c6bc175621ad30a416c8c4345f95ce3c264.zip | |
Merge remote branch 'rails/master'
Diffstat (limited to 'activemodel')
| -rw-r--r-- | activemodel/activemodel.gemspec | 2 | ||||
| -rw-r--r-- | activemodel/lib/active_model/observing.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/activemodel/activemodel.gemspec b/activemodel/activemodel.gemspec index 678007c0ef..6bd6fe49ff 100644 --- a/activemodel/activemodel.gemspec +++ b/activemodel/activemodel.gemspec @@ -21,5 +21,5 @@ Gem::Specification.new do |s| s.add_dependency('activesupport', version) s.add_dependency('builder', '~> 2.1.2') - s.add_dependency('i18n', '~> 0.4.0') + s.add_dependency('i18n', '~> 0.4.1') end diff --git a/activemodel/lib/active_model/observing.rb b/activemodel/lib/active_model/observing.rb index 74a33d45ab..d7e3ca100e 100644 --- a/activemodel/lib/active_model/observing.rb +++ b/activemodel/lib/active_model/observing.rb @@ -2,6 +2,7 @@ require 'singleton' require 'active_support/core_ext/array/wrap' require 'active_support/core_ext/module/aliasing' require 'active_support/core_ext/string/inflections' +require 'active_support/core_ext/string/conversions' module ActiveModel module Observing |