diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-05-29 16:06:21 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-05-29 16:06:21 -0500 |
| commit | 69742ca8fa05509f7d7c5512cb6d8e002ecb3ab3 (patch) | |
| tree | 044c2131cc87d21ee54027511aae2b7f2d2ae26a /railties/lib/rails/plugin/locator.rb | |
| parent | 5f3f100ce2d689480da85abc88e5e940cf90189e (diff) | |
| parent | 5ec2c7dc29b36d85b2658465b8a979deb0529d7e (diff) | |
| download | rails-69742ca8fa05509f7d7c5512cb6d8e002ecb3ab3.tar.gz rails-69742ca8fa05509f7d7c5512cb6d8e002ecb3ab3.tar.bz2 rails-69742ca8fa05509f7d7c5512cb6d8e002ecb3ab3.zip | |
Merge branch 'master' into active_model
Conflicts:
activemodel/lib/active_model/core.rb
activemodel/test/cases/state_machine/event_test.rb
activemodel/test/cases/state_machine/state_transition_test.rb
activerecord/lib/active_record/validations.rb
activerecord/test/cases/validations/i18n_validation_test.rb
activeresource/lib/active_resource.rb
activeresource/test/abstract_unit.rb
Diffstat (limited to 'railties/lib/rails/plugin/locator.rb')
| -rw-r--r-- | railties/lib/rails/plugin/locator.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/plugin/locator.rb b/railties/lib/rails/plugin/locator.rb index a6fc388a8e..1057c004e0 100644 --- a/railties/lib/rails/plugin/locator.rb +++ b/railties/lib/rails/plugin/locator.rb @@ -25,7 +25,7 @@ module Rails end def plugin_names - plugins.map(&:name) + plugins.map {|plugin| plugin.name } end end |