aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/rails/rails into performance_testGonçalo Silva2011-05-0814-101/+145
|\
| * Don't pluralize, camelize.José Valim2011-05-061-1/+1
| * Only show dump of regular env methods on exception screen (not all the rack c...David Heinemeier Hansson2011-05-042-5/+6
| * Merge pull request #387 from smartinez87/remove_method.José Valim2011-05-041-2/+3
| |\
| | * Use #remove_possible_method instead hereSebastian Martinez2011-05-041-2/+3
| * | Fix renew feature on cookies.José Valim2011-05-041-1/+1
| * | Fix .subdomain regression.José Valim2011-05-041-1/+1
| |/
| * cache strings in the AST for faster comparison than include?Aaron Patterson2011-05-031-6/+3
| * Merge pull request #377 from joshk/rails_legacy_mapper_message.José Valim2011-05-031-0/+5
| |\
| | * raise an error if the old router draw method is used, along with a message ad...Josh Kalderimis2011-05-031-0/+5
| * | Sets the HTTP charset parameter for rescue response.Matias Korhonen2011-05-031-1/+1
| * | Rescues template HTML5 doctype and the utf8 charset meta tag, and better font...Matias Korhonen2011-05-031-2/+4
| * | Static middleware accepts cache control.José Valim2011-05-031-4/+4
| |/
| * Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2011-05-022-5/+24
| |\
| | * More performance optimizations.José Valim2011-05-031-5/+0
| | * Improve performance for filtered parameters and add tests.José Valim2011-05-031-0/+5
| | * Allow ignore_accept_header through configuration option.José Valim2011-05-021-0/+2
| | * Add ignore_accept_header config to AD::Request.José Valim2011-05-021-5/+22
| * | Flunk makes a lot more sense, doesnt it (hat tip @tenderlove)David Heinemeier Hansson2011-05-021-1/+1
| |/
| * Explicitly define main_app proxyPiotr Sarnacki2011-04-251-2/+1
| * show http method in routing error messageSchneems2011-04-231-1/+1
| * We cant use assert_block because its buggy in MiniTest and wont actually show...David Heinemeier Hansson2011-04-221-1/+1
| * Fix tests on 1.8 by explicitly checking for strings (which also improves perf...José Valim2011-04-201-1/+9
| * Use initialize_copy! to proper initialize now on clone.José Valim2011-04-191-15/+18
| * Don't reuse a closed flash when using nowFlorent Piteau2011-04-201-1/+5
| * Do not inherit from Rack::Response, remove a shit-ton of unused code.José Valim2011-04-192-53/+49
| * Be sure to not store the closed flash in the session.José Valim2011-04-191-16/+25
* | Merge branch 'master' of https://github.com/rails/rails into performance_testGonçalo Silva2011-04-179-257/+134
|\|
| * Make static faster as we don't have to serve multiple paths anymore.José Valim2011-04-151-28/+15
| * generated session ids should be encoded as UTF-8Aaron Patterson2011-04-141-1/+3
| * Remove `#among?` from Active SupportPrem Sichanugrist2011-04-133-4/+4
| * renames response_from_page_or_rjs -> response_from_page, and extracts the RJS...Xavier Noria2011-04-131-58/+5
| * removes assert_select_rjsXavier Noria2011-04-131-139/+1
| * Change Object#either? to Object#among? -- thanks to @jamesarosen for the sugg...David Heinemeier Hansson2011-04-124-5/+5
| * Using Object#in? and Object#either? in various placesPrem Sichanugrist2011-04-114-5/+10
| * Merge branch 'master' of github.com:rails/railsAaron Patterson2011-04-071-1/+1
| |\
| | * Cache flash nowSantiago Pastorino2011-04-071-1/+1
| | * Revert "Use freeze instead of close!"Santiago Pastorino2011-04-072-5/+14
| | * Revert "Eagerly load Signed and Permanent cookies"Santiago Pastorino2011-04-071-17/+10
| | * Eagerly load Signed and Permanent cookiesSantiago Pastorino2011-04-071-10/+17
| | * Use freeze instead of close!Santiago Pastorino2011-04-062-14/+5
| * | getting the flash hash under testAaron Patterson2011-04-061-0/+4
| * | favor composition over inheritance, have FlashHash delegate to a HashAaron Patterson2011-04-061-7/+40
| |/
| * CookieJar should prefer composition over inheritanceAaron Patterson2011-04-061-6/+10
| * Make process reuse the env var passed as argumentSantiago Pastorino2011-04-061-5/+4
| * raise if someone tries to modify the cookies when it was already streamed bac...Santiago Pastorino2011-04-061-0/+12
| * Add ClosedError message to the initializerSantiago Pastorino2011-04-062-5/+9
| * raise if someone tries to modify the flash when it was already streamed back ...Santiago Pastorino2011-04-051-1/+19
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-04-031-8/+8
| |\
| | * Fix grammar, formatting, and cross referencesJohn Firebaugh2011-03-281-8/+8