Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2009-05-18 | 2 | -1/+9 |
|\ | |||||
| * | Truncate helper accepts a :separator for a more legible result [#1807 ↵ | Andy Stewart | 2009-05-18 | 2 | -1/+9 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2009-05-18 | 56 | -300/+583 |
|\| | |||||
| * | Ensure HTTP Digest auth uses appropriate HTTP method [#2490 state:resolved] ↵ | Pratik Naik | 2009-05-18 | 2 | -4/+22 |
| | | | | | | | | [Steve Madsen] | ||||
| * | Allow ParamsParser to parse YAML from the request body IO directly | Brian Lopez | 2009-05-17 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Fix reset_session with ActiveRecord store [#2200 state:resolved] | Joshua Peek | 2009-05-17 | 1 | -3/+3 |
| | | |||||
| * | Extract generic callbacks middleware from dispatcher | Joshua Peek | 2009-05-17 | 5 | -75/+101 |
| | | |||||
| * | Add tests for assert_template :template | Mike Breen | 2009-05-17 | 1 | -0/+23 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Merge Failsafe middleware into ShowExceptions | Joshua Peek | 2009-05-17 | 8 | -105/+64 |
| | | |||||
| * | Rescue hack was supposed to be removed. Some how it crept back in. | Joshua Peek | 2009-05-17 | 4 | -10/+2 |
| | | |||||
| * | Ensure number_to_human_size does not strip zeros from the end [#1763 ↵ | Travis Briggs | 2009-05-17 | 2 | -1/+10 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Simplify filter_chain method implementation [#2327 state:resolved] | Thomas E. Glasgow | 2009-05-17 | 1 | -6/+1 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Ensure auto_link does not ignore multiple trailing punctuations [#2504 ↵ | Lance Ivy | 2009-05-17 | 2 | -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 Lopez | 2009-05-17 | 1 | -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/test | Pratik Naik | 2009-05-17 | 1 | -1/+1 |
| | | |||||
| * | Ensure WhiteListSanitizer allows dl tag [#2393 state:resolved] | Jeffrey Chupp | 2009-05-17 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Fix ActionMailer Symbol#to_proc instance | Yehuda Katz | 2009-05-16 | 1 | -1/+1 |
| | | |||||
| * | Changelog | Bryan Helmkamp | 2009-05-16 | 1 | -0/+2 |
| | | |||||
| * | Instead of checking Rails.env.test? in Failsafe middleware, check ↵ | Bryan Helmkamp | 2009-05-16 | 3 | -8/+9 |
| | | | | | | | | env["rails.raise_exceptions"] | ||||
| * | Ported Rescuable to new base | Yehuda Katz + Carl Lerche | 2009-05-15 | 9 | -27/+111 |
| | | |||||
| * | Refactored AbstractController to provide better hook points for overriding ↵ | Yehuda Katz + Carl Lerche | 2009-05-15 | 5 | -33/+39 |
| | | | | | | | | aspects of action dispatching | ||||
| * | Allow strings to be sent as collection to select. | José Valim | 2009-05-15 | 2 | -0/+24 |
| | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| * | Merge commit 'origin/master' | Yehuda Katz + Carl Lerche | 2009-05-14 | 7 | -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 Lerche | 2009-05-14 | 8 | -11/+61 |
| | | | | | | | | | | | | action semantics in compatibility mode, and fixed a few action_missing bugs. | ||||
| * | | Cleaning up more render tests | Yehuda Katz + Carl Lerche | 2009-05-14 | 11 | -33/+122 |
| | | | |||||
* | | | Active Support dependencies | Jeremy Kemper | 2009-05-14 | 2 | -0/+2 |
| |/ |/| | |||||
* | | Minimal base/new_base comparison | Jeremy Kemper | 2009-05-14 | 6 | -21/+50 |
| | | |||||
* | | Cherry-picking Active Support extensions | Jeremy Kemper | 2009-05-14 | 1 | -2/+4 |
| | | |||||
* | | Simple example for require profiling | Jeremy Kemper | 2009-05-14 | 1 | -0/+17 |
|/ | |||||
* | Ported over render :file tests. | Yehuda Katz + Carl Lerche | 2009-05-13 | 8 | -321/+585 |
| | |||||
* | Cherry-pick core extensions | Jeremy Kemper | 2009-05-13 | 23 | -44/+49 |
| | |||||
* | isolated_test task | Jeremy Kemper | 2009-05-13 | 1 | -0/+6 |
| | |||||
* | Implemented redirects and partial rendering in new base. | Yehuda Katz + Carl Lerche | 2009-05-12 | 20 | -102/+251 |
| | |||||
* | Fixed new callbacks to not call the action when a callback sets the response ↵ | Yehuda Katz + Carl Lerche | 2009-05-12 | 2 | -1/+20 |
| | | | | body | ||||
* | Defer rake/contrib/sshpublisher require so we can use the stdlib rake ↵ | Jeremy Kemper | 2009-05-11 | 1 | -1/+2 |
| | | | | instead of the full gem | ||||
* | Merge branch 'master' into wip_abstract_controller | Yehuda Katz + Carl Lerche | 2009-05-11 | 59 | -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 Lerche | 2009-05-11 | 14 | -84/+95 |
| | | | | | | | | This reverts commit a747ab5b20b9d543e9d311070e3b720c761ae716. | ||||
| * | Whitespace! | Joshua Peek | 2009-05-07 | 14 | -95/+84 |
| | | |||||
| * | Prefer "included" language over "setup" | Joshua Peek | 2009-05-07 | 5 | -15/+18 |
| | | |||||
| * | Make module dependency DSL opt in | Joshua Peek | 2009-05-07 | 9 | -13/+24 |
| | | |||||
| * | assert_redirect_to's partial hash matching was deprecated in 2-3 stable ↵ | Joshua Peek | 2009-05-04 | 1 | -7/+0 |
| | | | | | | | | 7f1f16c01 | ||||
| * | Wrap dispatcher callbacks around the whole middleware chain. Kill ↵ | Joshua Peek | 2009-05-03 | 3 | -38/+22 |
| | | | | | | | | unnecessary Reloader middleware. | ||||
| * | Show lazy middleware args in pretty print | Joshua Peek | 2009-05-03 | 1 | -2/+1 |
| | | |||||
| * | Extract ActionController rescue templates into Rescue and ShowExceptions ↵ | Joshua Peek | 2009-05-02 | 28 | -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 expectation | Jeremy Kemper | 2009-05-02 | 1 | -1/+1 |
| | | |||||
| * | Deprecate Controller.process interface | Joshua Peek | 2009-05-02 | 3 | -10/+13 |
| | | |||||
| * | Switch functional tests to run through the rack interface instead of process | Joshua Peek | 2009-05-02 | 7 | -10/+28 |
| | | |||||
| * | Functional test runner finalizes response just like the integration test ↵ | Joshua Peek | 2009-05-02 | 9 | -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 matching | Joshua Peek | 2009-05-02 | 8 | -28/+26 |
| | | |||||
* | | Fixed a bug with handling render options | Yehuda Katz + Carl Lerche | 2009-05-11 | 3 | -66/+12 |
| | |