Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' | Olli Jokinen | 2011-12-01 | 29 | -102/+134 |
|\ | |||||
| * | Log 'Filter chain halted as CALLBACKNAME rendered or redirected' every time ↵ | José Valim | 2011-11-30 | 2 | -1/+10 |
| | | | | | | | | a before callback halts. | ||||
| * | removes a Serialization constant left in the previous revert | Xavier Noria | 2011-11-25 | 1 | -1/+0 |
| | | |||||
| * | Revert the serializers API as other alternatives are now also under discussion | José Valim | 2011-11-25 | 1 | -51/+0 |
| | | |||||
| * | Add docs to serializers. Update CHANGELOGs. | José Valim | 2011-11-25 | 1 | -0/+23 |
| | | |||||
| * | Rely solely on active_model_serializer and remove the fancy constant lookup. | José Valim | 2011-11-23 | 1 | -1/+3 |
| | | |||||
| * | Merge branch 'master' into serializers | José Valim | 2011-11-23 | 11 | -37/+35 |
| |\ | |||||
| | * | Rely on a public contract between railties instead of accessing railtie ↵ | José Valim | 2011-11-23 | 1 | -3/+4 |
| | | | | | | | | | | | | methods directly. | ||||
| | * | move show_detailed_exceptions? to Rescue module | lest | 2011-11-22 | 3 | -5/+12 |
| | | | |||||
| | * | add ActionController::Metal#show_detailed_exceptions? | lest | 2011-11-22 | 1 | -0/+5 |
| | | | |||||
| | * | Merge pull request #3613 from mitio/fix-actionpack-responder-docs | Xavier Noria | 2011-11-11 | 1 | -4/+4 |
| | |\ | | | | | | | | | Fix wording and minor typos in the Responder RDoc | ||||
| | | * | Fix wording and minor typos in the Responder RDoc | Dimitar Dimitrov | 2011-11-11 | 1 | -4/+4 |
| | | | | |||||
| | * | | Merge pull request #3581 from amatsuda/metal_response_body_19 | José Valim | 2011-11-10 | 1 | -1/+7 |
| | |\ \ | | | | | | | | | | | AC::Metal#response_body= stores different value in Ruby 1.8 and 1.9 | ||||
| | | * | | Fix AC::Metal#response_body= to store same value on Ruby 1.8 and 1.9 | Akira Matsuda | 2011-11-07 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | This was because String#respond_to?(:each) differs in 1.8 and 1.9 | ||||
| | * | | | DrbStore removed from cache backends | Ivan Evtukhovich | 2011-11-07 | 1 | -1/+0 |
| | | | | | |||||
| | * | | | fix incorrect code example | Vijay Dev | 2011-11-07 | 1 | -1/+1 |
| | |/ / | |||||
| | * | | this should never return nil, so no use for "try" | Aaron Patterson | 2011-10-31 | 1 | -1/+1 |
| | | | | |||||
| | * | | Ensure that the format isn't applied twice to the cache key, else it becomes ↵ | Christopher Meiklejohn | 2011-10-31 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | impossible to target with expire_action. | ||||
| | * | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-10-30 | 1 | -2/+2 |
| | |\ \ | |||||
| | | * | | add namespacing when referring to ActionController::RedirectBackError | Nick Howard | 2011-10-25 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Responders now return 204 No Content for API requests without a response ↵ | José Valim | 2011-10-26 | 1 | -21/+1 |
| | |/ / | | | | | | | | | | | | | body (as in the new scaffold) | ||||
| | * | | HTMl -> HTML: html scanner comment fix | Alexey Vakhov | 2011-10-15 | 1 | -1/+1 |
| | | | | |||||
| | * | | Update AC::RecordIdentifier example | Alexey Vakhov | 2011-10-15 | 1 | -2/+2 |
| | |/ | |||||
| * | | Refactor to make renderers a Set | Jose and Yehuda | 2011-10-15 | 1 | -11/+9 |
| | | | |||||
| * | | Initial commit of serializer support | Jose and Yehuda | 2011-10-15 | 2 | -0/+27 |
| |/ | |||||
| * | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-10-14 | 2 | -2/+4 |
| |\ | |||||
| | * | status is a number in Rails 3 | Akira Matsuda | 2011-10-12 | 1 | -2/+2 |
| | | | |||||
| | * | Add ActionController#head example | Alexey Vakhov | 2011-10-11 | 1 | -0/+2 |
| | | | |||||
| * | | Support symbol and string actions in AC#respond_to options | Alexey Vakhov | 2011-10-11 | 1 | -3/+3 |
| |/ | |||||
| * | JSON responder should return errors with :error root | Denis Odorcic | 2011-10-10 | 1 | -1/+9 |
| | | |||||
| * | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-10-09 | 1 | -1/+1 |
| |\ | |||||
| | * | Fix params hash example in AC::Base comment | Alexey Vakhov | 2011-10-08 | 1 | -1/+1 |
| | | | |||||
| * | | accept optional :host parameter to force_ssl | Ben Scheirman | 2011-10-08 | 1 | -2/+5 |
| | | | |||||
| * | | Remove unnecessary dup in expire_page | Alexey Vakhov | 2011-10-08 | 1 | -1/+1 |
| |/ | |||||
| * | Merge pull request #3193 from avakhov/patch-ac-test-case-safe-constantize | José Valim | 2011-10-03 | 1 | -3/+1 |
| |\ | | | | | | | use safe_constantize instead constantize in AC::TestCase | ||||
| | * | use safe_constantize instead constantize in AC::TestCase | Alexey Vakhov | 2011-10-03 | 1 | -3/+1 |
| | | | |||||
| * | | normalize arg for AC::TestCase tests class method | Alexey Vakhov | 2011-10-03 | 1 | -2/+14 |
| |/ | |||||
| * | add missing require to html sanitizer | Alexey Vakhov | 2011-09-27 | 1 | -0/+1 |
| | | |||||
| * | Use safe_constantize where possible. | José Valim | 2011-09-23 | 1 | -6/+3 |
| | | |||||
| * | Change log level for CSRF token verification warning | Mike Dillon | 2011-09-10 | 1 | -1/+1 |
| | | |||||
| * | Nicolás Hock Isaza | 2011-09-06 | 1 | -1/+1 | |
| | | | | | | | | | | Fixing `record_key_for_dom_id` documentation. The default implementation joins everything with '_' and not with '-' | ||||
| * | Eliminate newlines in basic auth. fixes #2882 | Aaron Patterson | 2011-09-06 | 1 | -1/+1 |
| | | |||||
| * | if ... nil? is more expensive than unless | Milan Dobrota | 2011-09-04 | 3 | -5/+5 |
| | | |||||
| * | fix helpers behavior description | Alexey Vakhov | 2011-09-03 | 1 | -3/+6 |
| | | |||||
| * | deletes spurious arrow | Xavier Noria | 2011-08-27 | 1 | -1/+1 |
| | | |||||
| * | doc fixes | Vijay Dev | 2011-08-28 | 1 | -8/+8 |
| | | |||||
| * | Make ActionController::TestCase#recycle! set @protocol to nil | David Majda | 2011-08-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | This ensures that the protocol does not get carried over when there are two or more requests in functional tests. This was a problem when e.g. the first request was HTTP and the second request was HTTPS. Closes #2654. Signed-off-by: Andrew White <andyw@pixeltrix.co.uk> | ||||
| * | Don't modify params in place - fixes #2624 | Andrew White | 2011-08-23 | 1 | -5/+3 |
| | | |||||
| * | Merge pull request #2596 from dharmatech/patch-1 | Santiago Pastorino | 2011-08-20 | 1 | -1/+1 |
| |\ | | | | | | | ActionController::Redirecting : fix docs typo | ||||
| | * | ActionController::Redirecting : fix docs typo | dharmatech | 2011-08-20 | 1 | -1/+1 |
| | | |