aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-05-181-1/+6
|\
| * Truncate helper accepts a :separator for a more legible result [#1807 ↵Andy Stewart2009-05-181-1/+6
| | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-05-1830-230/+331
|\|
| * Ensure HTTP Digest auth uses appropriate HTTP method [#2490 state:resolved] ↵Pratik Naik2009-05-181-1/+2
| | | | | | | | [Steve Madsen]
| * Allow ParamsParser to parse YAML from the request body IO directlyBrian Lopez2009-05-171-1/+1
| | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Extract generic callbacks middleware from dispatcherJoshua Peek2009-05-174-61/+81
| |
| * Merge Failsafe middleware into ShowExceptionsJoshua Peek2009-05-174-100/+40
| |
| * Rescue hack was supposed to be removed. Some how it crept back in.Joshua Peek2009-05-172-6/+2
| |
| * Ensure number_to_human_size does not strip zeros from the end [#1763 ↵Travis Briggs2009-05-171-1/+6
| | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Simplify filter_chain method implementation [#2327 state:resolved]Thomas E. Glasgow2009-05-171-6/+1
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Ensure auto_link does not ignore multiple trailing punctuations [#2504 ↵Lance Ivy2009-05-171-6/+7
| | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Add support for parsing XML and JSON from an IO as well as a string [#2659 ↵Brian Lopez2009-05-171-5/+3
| | | | | | | | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Ensure WhiteListSanitizer allows dl tag [#2393 state:resolved]Jeffrey Chupp2009-05-171-1/+1
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Fix ActionMailer Symbol#to_proc instanceYehuda Katz2009-05-161-1/+1
| |
| * Instead of checking Rails.env.test? in Failsafe middleware, check ↵Bryan Helmkamp2009-05-161-3/+2
| | | | | | | | env["rails.raise_exceptions"]
| * Ported Rescuable to new baseYehuda Katz + Carl Lerche2009-05-158-25/+101
| |
| * Refactored AbstractController to provide better hook points for overriding ↵Yehuda Katz + Carl Lerche2009-05-154-29/+36
| | | | | | | | aspects of action dispatching
| * Allow strings to be sent as collection to select.José Valim2009-05-151-0/+2
| | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Merge commit 'origin/master'Yehuda Katz + Carl Lerche2009-05-145-4/+16
| |\ | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/abstract/base.rb actionpack/lib/action_controller/routing.rb
| * | Got new base to pass controller/base_test.rb, implemented method_missing ↵Yehuda Katz + Carl Lerche2009-05-146-9/+59
| | | | | | | | | | | | action semantics in compatibility mode, and fixed a few action_missing bugs.
| * | Cleaning up more render testsYehuda Katz + Carl Lerche2009-05-144-1/+14
| | |
* | | Active Support dependenciesJeremy Kemper2009-05-141-0/+1
| |/ |/|
* | Minimal base/new_base comparisonJeremy Kemper2009-05-144-4/+16
| |
* | Cherry-picking Active Support extensionsJeremy Kemper2009-05-141-2/+4
|/
* Cherry-pick core extensionsJeremy Kemper2009-05-1317-40/+42
|
* Implemented redirects and partial rendering in new base.Yehuda Katz + Carl Lerche2009-05-1216-65/+210
|
* Fixed new callbacks to not call the action when a callback sets the response ↵Yehuda Katz + Carl Lerche2009-05-121-1/+1
| | | | body
* Merge branch 'master' into wip_abstract_controllerYehuda Katz + Carl Lerche2009-05-1138-349/+376
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/abstract/callbacks.rb actionpack/lib/action_controller/abstract/renderer.rb actionpack/lib/action_controller/base/base.rb actionpack/lib/action_controller/dispatch/dispatcher.rb actionpack/lib/action_controller/routing/route_set.rb actionpack/lib/action_controller/testing/process.rb actionpack/test/abstract_controller/layouts_test.rb actionpack/test/controller/filters_test.rb actionpack/test/controller/helper_test.rb actionpack/test/controller/render_test.rb actionpack/test/new_base/test_helper.rb
| * Revert "Whitespace!"Yehuda Katz + Carl Lerche2009-05-1114-84/+95
| | | | | | | | This reverts commit a747ab5b20b9d543e9d311070e3b720c761ae716.
| * 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-076-2/+13
| |
| * Wrap dispatcher callbacks around the whole middleware chain. Kill ↵Joshua Peek2009-05-033-38/+22
| | | | | | | | unnecessary Reloader middleware.
| * Show lazy middleware args in pretty printJoshua Peek2009-05-031-2/+1
| |
| * Extract ActionController rescue templates into Rescue and ShowExceptions ↵Joshua Peek2009-05-0219-230/+239
| | | | | | | | | | middleware. This commit breaks all exception catching plugins like ExceptionNotifier. These plugins should be rewritten as middleware instead overriding Controller#rescue_action_in_public.
| * Deprecate Controller.process interfaceJoshua Peek2009-05-021-0/+1
| |
| * Switch functional tests to run through the rack interface instead of processJoshua Peek2009-05-026-9/+27
| |
| * Functional test runner finalizes response just like the integration test ↵Joshua Peek2009-05-023-14/+11
| | | | | | | | | | runner. In both runners, the @response object will now behave the same. Some functional tests will need to be updated if they are relying on preprocessed data on the response.
| * Deprecate assert_redirect_to's partial hash matchingJoshua Peek2009-05-026-23/+17
| |
* | Fixed a bug with handling render optionsYehuda Katz + Carl Lerche2009-05-112-2/+11
| |
* | Aliased AbstractController::ActionNotFound to ActionController::UnknownActionYehuda Katz + Carl Lerche2009-05-112-5/+9
| |
* | Ported ConditionalGet to new BaseYehuda Katz + Carl Lerche2009-05-116-1/+98
| |
* | Don't run the action if callbacks are halted.Yehuda Katz + Carl Lerche2009-05-111-1/+1
| | | | | | In AbstractController, this means that response_body is not empty
* | Ported fresh_when into a ConditionalGet moduleYehuda Katz + Carl Lerche2009-05-114-0/+45
| |
* | More community code review :)Yehuda Katz2009-05-114-12/+6
| |
* | Implement FooController.action(:name)Yehuda Katz2009-05-024-20/+26
| | | | | | | | | | | | * Rails actions are now Rack endpoints, and can be retrieved via FooController.action(name) and called with an env * Updated some tests that relied on the old internal #process/#call implementation
* | Get render :inline workingYehuda Katz + Carl Lerche2009-05-013-2/+6
| |
* | A few more tweaks to get new Base running old render tests againYehuda Katz + Carl Lerche2009-05-012-4/+8
| |
* | Renamed Base2 to Base and don't require old action_controller for new BaseYehuda Katz + Carl Lerche2009-05-015-47/+136
| |
* | Starting to get new_base to run on old testsYehuda Katz + Carl Lerche2009-05-014-0/+95
| |