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
..
application	Remove highly uncommon config.assets.manifest option for moving the manifest path.	2012-09-19 18:02:37 -05:00
commands	Support MySQL SSL in rails dbconsole.	2012-09-10 12:36:49 -07:00
console
engine
generators	Merge branch 'master' of github.com:lifo/docrails	2012-09-21 22:49:20 +05:30
rack
railtie	Get rid of config.preload_frameworks in favor of config.eager_load_namespaces	2012-08-21 14:47:19 -03:00
tasks
templates
test_unit
all.rb
application.rb	Clarify the documentation on the Rails::Application#call method	2012-09-15 11:11:54 -04:00
backtrace_cleaner.rb
cli.rb
code_statistics.rb
commands.rb
configuration.rb
deprecation.rb	Remove 'assigned but unused variable' warning	2012-09-18 16:53:36 +03:00
engine.rb	Updated description of what engines are used for	2012-09-21 10:57:15 -06:00
generators.rb	Extract ActiveRecord::SessionStore from Rails	2012-08-24 15:24:19 -04:00
info.rb
info_controller.rb
initializable.rb
paths.rb
performance_test_help.rb
rack.rb
railtie.rb	Get rid of config.preload_frameworks in favor of config.eager_load_namespaces	2012-08-21 14:47:19 -03:00
ruby_version_check.rb
rubyprof_ext.rb
script_rails_loader.rb
source_annotation_extractor.rb
tasks.rb
test_help.rb
version.rb