Vijay Dev 3b7947ea31 Merge branch 'master' of github.com:lifo/docrails ... Conflicts: actionmailer/lib/action_mailer/base.rb activesupport/lib/active_support/configurable.rb activesupport/lib/active_support/core_ext/module/deprecation.rb guides/source/action_controller_overview.md guides/source/active_support_core_extensions.md guides/source/ajax_on_rails.textile guides/source/association_basics.textile guides/source/upgrading_ruby_on_rails.md While resolving conflicts, I have chosen to ignore changes done in docrails at some places - these will be most likely 1.9 hash syntax changes.		2012-09-21 22:49:20 +05:30
..
css
erb	Remove :confirm in favor of :data => { :confirm => 'Text' } option	2012-07-18 10:32:17 -03:00
js/assets	Move Coffee generators and templates to Coffee Railtie and create javascript_engine ("js") for apps that remove Coffee gem	2011-06-29 21:16:09 -03:00
rails	Change scaffold_generator: Don't use #require or #permit in scaffold if attributes list isn't given	2012-09-16 23:58:21 -05:00
test_unit	update performance test template to use test method	2012-07-06 15:53:17 -05:00
actions.rb	Merge branch 'master' of github.com:lifo/docrails	2012-05-23 23:26:39 +05:30
active_model.rb	Revert "Remove blank trailing comments"	2012-05-23 22:43:08 +05:30
app_base.rb	change app/plugin generators to be more SCM agnostic	2012-09-12 20:36:00 -05:00
base.rb	Remove redundant 'the'.	2012-09-13 21:36:26 +03:00
erb.rb
generated_attribute.rb	Add fkey attributes to join_table migration generator	2012-07-19 00:24:21 +04:00
migration.rb	Removing ==Examples and last blank lines of docs from railties	2012-05-14 10:50:59 -05:00
named_base.rb	reduce number of Strings	2012-06-06 23:33:31 +09:00
resource_helpers.rb	Revert "Remove blank trailing comments"	2012-05-23 22:43:08 +05:30
test_case.rb	use system tmpdir rather than our own	2012-06-19 14:41:31 -07:00
test_unit.rb