diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-09-14 12:54:43 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-09-14 13:04:43 -0700 |
| commit | 697dda5f29acc1d9144770022b74aabb06f4cee0 (patch) | |
| tree | ca3247c39aa731e6b3c8ff6443de540a775da821 | |
| parent | 70d2640700f178f1430c4080d2e7183fe06bd7a8 (diff) | |
| download | rails-697dda5f29acc1d9144770022b74aabb06f4cee0.tar.gz rails-697dda5f29acc1d9144770022b74aabb06f4cee0.tar.bz2 rails-697dda5f29acc1d9144770022b74aabb06f4cee0.zip | |
Fix deprecated gem-name requires
| -rw-r--r-- | activemodel/examples/validations.rb | 2 | ||||
| -rw-r--r-- | railties/test/generators/generators_test_helper.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activemodel/examples/validations.rb b/activemodel/examples/validations.rb index 3f8311ff96..b039897ea5 100644 --- a/activemodel/examples/validations.rb +++ b/activemodel/examples/validations.rb @@ -1,4 +1,4 @@ -require 'activemodel' +require 'active_model' class Person include ActiveModel::Conversion diff --git a/railties/test/generators/generators_test_helper.rb b/railties/test/generators/generators_test_helper.rb index a258574dce..e837fdb859 100644 --- a/railties/test/generators/generators_test_helper.rb +++ b/railties/test/generators/generators_test_helper.rb @@ -12,7 +12,7 @@ $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../../lib" $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../../../activerecord/lib" $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../../../actionpack/lib" require 'generators' -require 'activerecord' +require 'active_record' require 'action_dispatch' CURRENT_PATH = File.expand_path(Dir.pwd) |