aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'mainstream/master'Pratik Naik2008-12-07126-9669/+2049
|\
| * Silence server backtrace in rescue templates and log files. Also remove some ...Joshua Peek2008-12-056-43/+69
| * Boot out CGI Processor.Joshua Peek2008-12-0410-533/+147
| * Ensure route set is cleared on teardownJoshua Peek2008-12-041-2/+2
| * Set template_format to html inside rjs templates so renders within it default...Joshua Peek2008-12-044-23/+1
| * Fix rendering html partials from an rjs templateSam Stephenson2008-12-046-1/+29
| * Ensure each rack request has its own dispatcher instanceJoshua Peek2008-12-041-1/+1
| * Refactor SessionFixationTest and WebServiceTest with IntegrationTest so they ...Joshua Peek2008-12-043-198/+235
| * Register bogus template handlers for ActionMailer test fixturesJoshua Peek2008-12-031-1/+1
| * Validate template extensions [#1187 state:resolved]Joshua Peek2008-12-032-8/+7
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-12-0310-7/+78
| |\
| | * Add internal middleware stack to DispatcherJoshua Peek2008-12-013-0/+51
| | * Making the IP Spoofing check in AbstractRequest#remote_ip configurable.Darren Boyd2008-12-014-1/+16
| | * Ensure ActionMailer doesn't blow up when a two argument proc is set for the a...Tekin Suleyman2008-12-011-1/+1
| | * allow options to be passed to email address auto generationAndrew Kaspick2008-12-012-5/+10
| * | Unnecessary CGI requireJeremy Kemper2008-12-031-1/+0
| * | Fix failsafe response path. [#1504 state:committed]Jeremy Kemper2008-12-031-1/+1
| |/
| * Simplify Request#pathJeremy Kemper2008-11-301-5/+3
| * Simplify REMOTE_ADDR parsingJeremy Kemper2008-11-301-1/+1
| * Deprecated formatted_polymorphic_urlJeremy Kemper2008-11-303-29/+32
| * Extract named_helper module_eval so it's easier to overrideJeremy Kemper2008-11-291-2/+6
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-11-2914-71/+214
| |\
| | * Make sure #compute_public_path caching allows to return different results for...Sven Fuchs2008-11-291-1/+1
| | * fixed template recompile issue with previous commit and add some better tests...Joshua Peek2008-11-285-11/+87
| | * Reinstate "Super lazy load view paths in development mode (no indexing or cac...Joshua Peek2008-11-2810-71/+88
| | * Revert "Super lazy load view paths in development mode (no indexing or cachin...David Heinemeier Hansson2008-11-2710-88/+71
| | * Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2008-11-2711-71/+89
| | |\
| | | * Super lazy load view paths in development mode (no indexing or caching at all...Joshua Peek2008-11-2610-71/+88
| | * | Added the option to declare an asset_host as an object that responds to call ...David Heinemeier Hansson2008-11-273-3/+53
| * | | Turn on debugger autoevalJeremy Kemper2008-11-291-0/+1
| | |/ | |/|
| * | Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-11-264-16/+70
| |\|
| | * Fix routing test and add changelog note about draw no longer clearing the rou...David Heinemeier Hansson2008-11-262-0/+3
| | * Added support for multiple routes files and made draw not clear the map so th...David Heinemeier Hansson2008-11-262-16/+67
| * | Ensure Test::Unit::Assertions is availableJeremy Kemper2008-11-261-0/+1
| |/
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-11-269-14/+95
| |\
| | * Added optimal formatted routes to rails, deprecating the formatted_* methods,...Aaron Batalion2008-11-269-14/+95
| * | No need to have #generate and #generate_extras per instanceJeremy Kemper2008-11-261-5/+10
| |/
| * Remove XmlSimple dependenciesJeremy Kemper2008-11-251-5/+4
| * Depend on rack 0.4.0 instead of vendoring itJoshua Peek2008-11-2543-4226/+4
| * Deprecate assert_validJoshua Peek2008-11-252-2/+3
| * Ensure ActionView will be available to ActionMailer if ActionController is no...Joshua Peek2008-11-252-1/+2
| * Ensure all HTML:: constants are available to autoload [#1462 state:resolved]Craig Davey2008-11-251-1/+8
| * Add config.preload_frameworks to load all frameworks at startup. Default to f...Jeremy Kemper2008-11-242-4/+0
| * Ruby 1.9 compat: explicitly require delegate for cookie's DelegateClassJeremy Kemper2008-11-241-0/+2
| * Test default singleton resource route to ensure it uses GET. This is importan...Geoff Garside2008-11-241-0/+10
| * Reorder the way in which map.resource routes are added to the set. This preve...Geoff Garside2008-11-241-1/+1
| * prototype and scripty helpers require jsonJoshua Peek2008-11-242-0/+2
| * helpers require dependenciesJoshua Peek2008-11-241-0/+2
| * Add LAZY env flag for testing autoload/lazy load featureJoshua Peek2008-11-242-2/+2
| * prefer autoloaded html scannerJoshua Peek2008-11-243-5/+2