Changeset [fda3ccfa6778a317666e3254b8f235bbcaecc016] by Josh Adams
Revision fda3ccfa6778a317666e3254b8f235bbcaecc016,
committed by Josh Adams
· December 22nd, 2008 @ 10:14 PM
Merge branch 'master' into work http://github.com/knewter/ansuz/...
28 changed files
-
M
vendor/plugins/engines/CHANGELOG -
M
vendor/plugins/engines/Rakefile -
M
vendor/plugins/engines/boot.rb -
M
vendor/plugins/engines/generators/plugin_migration/plugin_migration_generator.rb -
M
vendor/plugins/engines/lib/engines.rb -
M
vendor/plugins/engines/lib/engines/assets.rb -
M
vendor/plugins/engines/lib/engines/plugin.rb -
M
vendor/plugins/engines/lib/engines/plugin/migrator.rb -
M
vendor/plugins/engines/lib/engines/rails_extensions/action_mailer.rb -
M
vendor/plugins/engines/lib/engines/rails_extensions/dependencies.rb -
M
vendor/plugins/engines/lib/engines/rails_extensions/migrations.rb -
M
vendor/plugins/engines/lib/engines/rails_extensions/routing.rb -
M
vendor/plugins/engines/lib/engines/testing.rb -
M
vendor/plugins/engines/tasks/engines.rake -
M
vendor/plugins/engines/test/app/views/app_and_plugin/a_view.html.erb -
M
vendor/plugins/engines/test/app/views/namespace/app_and_plugin/a_view.html.erb -
M
vendor/plugins/engines/test/functional/routes_test.rb -
M
vendor/plugins/engines/test/functional/view_helpers_test.rb -
M
vendor/plugins/engines/test/lib/engines_test_helper.rb -
M
vendor/plugins/engines/test/plugins/alpha_plugin/app/views/alpha_plugin/a_view.html.erb -
M
vendor/plugins/engines/test/plugins/alpha_plugin/app/views/app_and_plugin/a_view.html.erb -
M
vendor/plugins/engines/test/plugins/alpha_plugin/app/views/namespace/alpha_plugin/a_view.html.erb -
M
vendor/plugins/engines/test/plugins/alpha_plugin/app/views/namespace/app_and_plugin/a_view.html.erb -
M
vendor/plugins/engines/test/plugins/alpha_plugin/app/views/namespace/shared_plugin/a_view.html.erb -
M
vendor/plugins/engines/test/plugins/alpha_plugin/app/views/shared_plugin/a_view.html.erb -
M
vendor/plugins/engines/test/plugins/beta_plugin/app/views/namespace/shared_plugin/a_view.html.erb -
M
vendor/plugins/engines/test/plugins/beta_plugin/app/views/shared_plugin/a_view.html.erb -
M
vendor/plugins/engines/test/unit/assets_test.rb