aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into nested_has_many_throughJon Leighton2010-11-27171-1857/+3057
|\
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2010-11-276-80/+185
| |\
| | * Add methods for configuring middleware to config guideRyan Bigg2010-11-271-0/+23
| | * Add "Configuring Middleware" section to config guide, starting with mentionin...Ryan Bigg2010-11-271-0/+25
| | * Add explicit statement that verify_authenticity_token can be turned off for a...Ryan Bigg2010-11-271-3/+7
| | * Add mention of config.serve_static_assets to config guideRyan Bigg2010-11-271-0/+2
| | * Mentioning catch with Bundler remembering options between different callsAndrés Mejía2010-11-261-1/+6
| | * Added missing word.Andrés Mejía2010-11-261-1/+1
| | * Resolving LH #5986, cookies doc updatesAditya Sanghi2010-11-261-3/+10
| | * Added documentation for config.generators to the config guideRyan Bigg2010-11-261-0/+27
| | * Add mention of after_initialize to the config guideRyan Bigg2010-11-261-0/+8
| | * There is no more load_application_initializers in Rails 3Ryan Bigg2010-11-261-1/+1
| | * root_path is now simply root in Rails 3Ryan Bigg2010-11-261-0/+2
| | * Update Changelog for configuring guideRyan Bigg2010-11-261-0/+1
| | * There is no RAILS_GEM_VERSION environment variable or constant for Rails 3, s...Ryan Bigg2010-11-261-2/+0
| | * There is no config.action_mailer.default_implicit_parts_order method for Rails 3Ryan Bigg2010-11-261-4/+0
| | * Mention the default config.action_mailer.default options in Configuration guideRyan Bigg2010-11-261-1/+7
| | * There is no config.action_mailer.default_content_type method for Rails 3Ryan Bigg2010-11-261-2/+0
| | * There is no config.action_mailer.default_charset method for Rails 3Ryan Bigg2010-11-261-2/+0
| | * Merge branch 'master' of github.com:lifo/docrailsRyan Bigg2010-11-261-2/+2
| | |\
| | | * Fix missing word in ActionMailer::Base documentation.Cheah Chu Yeow2010-11-251-2/+2
| | * | Update ActionMailer documentation to not use deprecated template_root method ...Ryan Bigg2010-11-261-1/+1
| | * | There is no config.action_mailer.template_root method for Rails 3Ryan Bigg2010-11-261-2/+0
| | * | There is no config.action_view.warn_cache_misses method for Rails 3Ryan Bigg2010-11-261-2/+0
| | * | Separate Action Dispatch and Action Pack sections in Configuration Guide.Ryan Bigg2010-11-261-2/+4
| | * | There is no config.action_controller.optimize_named_routes method for Rails 3Ryan Bigg2010-11-261-2/+0
| | * | There is no config.action_controller.resource_path_names method for Rails 3Ryan Bigg2010-11-261-2/+0
| | * | There is no config.action_controller.params_parser method for Rails 3. This i...Ryan Bigg2010-11-261-2/+0
| | * | There is no view_path config option in Rails 3Ryan Bigg2010-11-261-2/+0
| | * | There is no root_path config option in Rails 3Ryan Bigg2010-11-261-2/+0
| | * | There is no plugin_paths config option in Rails 3Ryan Bigg2010-11-261-2/+0
| | * | There is no plugin_locators config option in Rails 3Ryan Bigg2010-11-261-2/+0
| | * | There is no plugin_loader config option in Rails 3Ryan Bigg2010-11-261-3/+0
| | * | load_once_paths is now autoload_paths in Rails 3Ryan Bigg2010-11-261-3/+4
| | * | There is no database_configuration_file method in Rails 3Ryan Bigg2010-11-261-2/+0
| | * | There is no controller_paths method in Rails 3Ryan Bigg2010-11-261-2/+0
| | * | Mention what cache_classes defaults to in all three default environmentsRyan Bigg2010-11-261-2/+2
| | * | Don't mention Rails 2.3, given that this is supposed to be a guide for Rails ...Ryan Bigg2010-11-261-2/+2
| | * | There is no more routes_configuration_file method.Ryan Bigg2010-11-261-2/+0
| | |/
| | * Add mention of nested resource to resources documentationRyan Bigg2010-11-241-0/+15
| | * Document the :path option for resources :postsRyan Bigg2010-11-241-0/+8
| | * Add :module option documentation for the resources methodRyan Bigg2010-11-241-0/+8
| | * Remove non-sensical first couple of lines for scope method documentationRyan Bigg2010-11-241-2/+0
| | * Paths in ActionDispatch::Scoping documentation should be for /admin/posts, no...Ryan Bigg2010-11-241-14/+14
| | * Fix formatting issue with rake routes output for the namespace methodRyan Bigg2010-11-241-7/+7
| * | Only convert direct hash instances in hash with indifferent access.José Valim2010-11-262-4/+11
| * | removes a couple of redundant selfsXavier Noria2010-11-261-2/+2
| * | implicit self hereSantiago Pastorino2010-11-251-1/+1
| * | move the setting up of the mime collector into the collector on initJosh Kalderimis2010-11-251-3/+3
| * | nil check unneeded ht. exvivaSantiago Pastorino2010-11-251-1/+1