aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)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 ↵Andy Stewart2009-05-182-1/+9
| | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | 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
| | | | | | | | [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>
| * 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
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * 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 ↵Travis Briggs2009-05-172-1/+10
| | | | | | | | | | | | 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-172-6/+14
| | | | | | | | | | | | 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 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
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * 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 ↵Bryan Helmkamp2009-05-163-8/+9
| | | | | | | | env["rails.raise_exceptions"]
| * Ported Rescuable to new baseYehuda Katz + Carl Lerche2009-05-159-27/+111
| |
| * Refactored AbstractController to provide better hook points for overriding ↵Yehuda Katz + Carl Lerche2009-05-155-33/+39
| | | | | | | | aspects of action dispatching
| * Allow strings to be sent as collection to select.José Valim2009-05-152-0/+24
| | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Merge commit 'origin/master'Yehuda Katz + Carl Lerche2009-05-147-4/+51
| |\ | | | | | | | | | | | | | | | 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-148-11/+61
| | | | | | | | | | | | action semantics in compatibility mode, and fixed a few action_missing bugs.
| * | 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
| | | | body
* Defer rake/contrib/sshpublisher require so we can use the stdlib rake ↵Jeremy Kemper2009-05-111-1/+2
| | | | instead of the full gem
* Merge branch 'master' into wip_abstract_controllerYehuda Katz + Carl Lerche2009-05-1159-732/+607
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-079-13/+24
| |
| * assert_redirect_to's partial hash matching was deprecated in 2-3 stable ↵Joshua Peek2009-05-041-7/+0
| | | | | | | | 7f1f16c01
| * 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-0228-556/+403
| | | | | | | | | | middleware. This commit breaks all exception catching plugins like ExceptionNotifier. These plugins should be rewritten as middleware instead overriding Controller#rescue_action_in_public.
| * 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 ↵Joshua Peek2009-05-029-58/+66
| | | | | | | | | | 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-028-28/+26
| |
* | Fixed a bug with handling render optionsYehuda Katz + Carl Lerche2009-05-113-66/+12
| |