aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-05-182-1/+9
|\
| * Truncate helper accepts a :separator for a more legible result [#1807 state:r...Andy Stewart2009-05-182-1/+9
* | Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-05-1856-300/+583
|\|
| * Ensure HTTP Digest auth uses appropriate HTTP method [#2490 state:resolved] [...Pratik Naik2009-05-182-4/+22
| * Allow ParamsParser to parse YAML from the request body IO directlyBrian Lopez2009-05-171-1/+1
| * Fix reset_session with ActiveRecord store [#2200 state:resolved]Joshua Peek2009-05-171-3/+3
| * Extract generic callbacks middleware from dispatcherJoshua Peek2009-05-175-75/+101
| * Add tests for assert_template :templateMike Breen2009-05-171-0/+23
| * Merge Failsafe middleware into ShowExceptionsJoshua Peek2009-05-178-105/+64
| * Rescue hack was supposed to be removed. Some how it crept back in.Joshua Peek2009-05-174-10/+2
| * Ensure number_to_human_size does not strip zeros from the end [#1763 state:re...Travis Briggs2009-05-172-1/+10
| * Simplify filter_chain method implementation [#2327 state:resolved]Thomas E. Glasgow2009-05-171-6/+1
| * Ensure auto_link does not ignore multiple trailing punctuations [#2504 state:...Lance Ivy2009-05-172-6/+14
| * Add support for parsing XML and JSON from an IO as well as a string [#2659 st...Brian Lopez2009-05-171-5/+3
| * Ensure rake test does not run new base tests as that requires rack/testPratik Naik2009-05-171-1/+1
| * Ensure WhiteListSanitizer allows dl tag [#2393 state:resolved]Jeffrey Chupp2009-05-171-1/+1
| * Fix ActionMailer Symbol#to_proc instanceYehuda Katz2009-05-161-1/+1
| * ChangelogBryan Helmkamp2009-05-161-0/+2
| * Instead of checking Rails.env.test? in Failsafe middleware, check env["rails....Bryan Helmkamp2009-05-163-8/+9
| * Ported Rescuable to new baseYehuda Katz + Carl Lerche2009-05-159-27/+111
| * Refactored AbstractController to provide better hook points for overriding as...Yehuda Katz + Carl Lerche2009-05-155-33/+39
| * Allow strings to be sent as collection to select.José Valim2009-05-152-0/+24
| * Merge commit 'origin/master'Yehuda Katz + Carl Lerche2009-05-147-4/+51
| |\
| * | Got new base to pass controller/base_test.rb, implemented method_missing acti...Yehuda Katz + Carl Lerche2009-05-148-11/+61
| * | Cleaning up more render testsYehuda Katz + Carl Lerche2009-05-1411-33/+122
* | | Active Support dependenciesJeremy Kemper2009-05-142-0/+2
| |/ |/|
* | Minimal base/new_base comparisonJeremy Kemper2009-05-146-21/+50
* | Cherry-picking Active Support extensionsJeremy Kemper2009-05-141-2/+4
* | Simple example for require profilingJeremy Kemper2009-05-141-0/+17
|/
* Ported over render :file tests.Yehuda Katz + Carl Lerche2009-05-138-321/+585
* Cherry-pick core extensionsJeremy Kemper2009-05-1323-44/+49
* isolated_test taskJeremy Kemper2009-05-131-0/+6
* Implemented redirects and partial rendering in new base.Yehuda Katz + Carl Lerche2009-05-1220-102/+251
* Fixed new callbacks to not call the action when a callback sets the response ...Yehuda Katz + Carl Lerche2009-05-122-1/+20
* Defer rake/contrib/sshpublisher require so we can use the stdlib rake instead...Jeremy Kemper2009-05-111-1/+2
* Merge branch 'master' into wip_abstract_controllerYehuda Katz + Carl Lerche2009-05-1159-732/+607
|\
| * Revert "Whitespace!"Yehuda Katz + Carl Lerche2009-05-1114-84/+95
| * Whitespace!Joshua Peek2009-05-0714-95/+84
| * Prefer "included" language over "setup"Joshua Peek2009-05-075-15/+18
| * Make module dependency DSL opt inJoshua Peek2009-05-079-13/+24
| * assert_redirect_to's partial hash matching was deprecated in 2-3 stable 7f1f1...Joshua Peek2009-05-041-7/+0
| * Wrap dispatcher callbacks around the whole middleware chain. Kill unnecessary...Joshua Peek2009-05-033-38/+22
| * Show lazy middleware args in pretty printJoshua Peek2009-05-031-2/+1
| * Extract ActionController rescue templates into Rescue and ShowExceptions midd...Joshua Peek2009-05-0228-556/+403
| * Fix implicit ordering expectationJeremy Kemper2009-05-021-1/+1
| * Deprecate Controller.process interfaceJoshua Peek2009-05-023-10/+13
| * Switch functional tests to run through the rack interface instead of processJoshua Peek2009-05-027-10/+28
| * Functional test runner finalizes response just like the integration test runn...Joshua Peek2009-05-029-58/+66
| * Deprecate assert_redirect_to's partial hash matchingJoshua Peek2009-05-028-28/+26
* | Fixed a bug with handling render optionsYehuda Katz + Carl Lerche2009-05-113-66/+12