Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Add CHANGELOG entry | Santiago Pastorino | 2012-03-02 | 1 | -0/+6 | |
| | ||||||
* | Fix #5238, rendered_format is not set when template is not rendered | Piotr Sarnacki | 2012-03-02 | 2 | -2/+8 | |
| | ||||||
* | Merge branch '3-2-2' into 3-2-stable | Aaron Patterson | 2012-03-01 | 4 | -6/+13 | |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | * 3-2-2: bumping to 3.2.2 Ensure [] respects the status of the buffer. Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepare Merge pull request #5084 from johndouthat/patch-1 updating RAILS_VERSION delete vulnerable AS::SafeBuffer#[] use AS::SafeBuffer#clone_empty for flushing the output_buffer add AS::SafeBuffer#clone_empty fix output safety issue with select options | |||||
| * | bumping to 3.2.2 | Aaron Patterson | 2012-03-01 | 1 | -1/+1 | |
| | | ||||||
| * | Merge branch '3-2-stable-security' into 3-2-2 | Aaron Patterson | 2012-03-01 | 3 | -5/+12 | |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | * 3-2-stable-security: Ensure [] respects the status of the buffer. delete vulnerable AS::SafeBuffer#[] use AS::SafeBuffer#clone_empty for flushing the output_buffer add AS::SafeBuffer#clone_empty fix output safety issue with select options | |||||
| | * | use AS::SafeBuffer#clone_empty for flushing the output_buffer | Akira Matsuda | 2012-02-20 | 1 | -1/+1 | |
| | | | ||||||
| | * | fix output safety issue with select options | Sergey Nartimov | 2012-02-20 | 2 | -4/+11 | |
| | | | ||||||
| * | | Merge pull request #5084 from johndouthat/patch-1 | Aaron Patterson | 2012-02-22 | 1 | -2/+1 | |
| | | | | | | | | | | | | Remove reference to rails_legacy_mapper, which isn't compatible with 3.2... | |||||
| * | | updating RAILS_VERSION | Aaron Patterson | 2012-02-22 | 1 | -2/+2 | |
| | | | ||||||
* | | | Add a new line after the textarea opening tag. | Rafael Mendonça França | 2012-02-27 | 3 | -38/+38 | |
| | | | | | | | | | | | | Closes #393 | |||||
* | | | Adding tests for non-optional glob parameters | Andrew White | 2012-02-26 | 1 | -2/+27 | |
| | | | ||||||
* | | | Fix typo in match :to docs | Justin Woodbridge | 2012-02-25 | 1 | -1/+1 | |
| | | | ||||||
* | | | assert => assert_equal | Arun Agrawal | 2012-02-25 | 1 | -3/+3 | |
| | | | ||||||
* | | | Checking headers in a better way. as doing here | Arun Agrawal | 2012-02-25 | 1 | -4/+3 | |
| | | | | | | | | | | | | 406ece4729e8fd81f156bcb3fce16e938522466e | |||||
* | | | Build fix for ruby187-p358 | Arun Agrawal | 2012-02-25 | 1 | -2/+7 | |
| | | | ||||||
* | | | Avoid inspecting the whole route set, closes #1525 | José Valim | 2012-02-23 | 1 | -0/+6 | |
| | | | ||||||
* | | | Merge pull request #5084 from johndouthat/patch-1 | Aaron Patterson | 2012-02-22 | 1 | -2/+1 | |
|/ / | | | | | | | Remove reference to rails_legacy_mapper, which isn't compatible with 3.2... | |||||
* | | Fix CHANGELOG | Santiago Pastorino | 2012-02-22 | 1 | -2/+2 | |
| | | ||||||
* | | Add CHANGELOG entry | Santiago Pastorino | 2012-02-22 | 1 | -0/+2 | |
| | | ||||||
* | | format lookup for partials is derived from the format in which the template ↵ | Santiago Pastorino | 2012-02-22 | 10 | -34/+23 | |
| | | | | | | | | | | | | is being rendered Closes #5025 part 2 | |||||
* | | fix bad docs from f373f296 [ci skip] | Vijay Dev | 2012-02-21 | 1 | -3/+3 | |
| | | ||||||
* | | Don't wrap the raise with ensure | Santiago Pastorino | 2012-02-21 | 2 | -10/+12 | |
| | | ||||||
* | | Restore lookup formats to the previous value after searching for the failing ↵ | Santiago Pastorino | 2012-02-21 | 2 | -2/+5 | |
| | | | | | | | | view | |||||
* | | Add CHANGELOG entry | Santiago Pastorino | 2012-02-21 | 1 | -0/+2 | |
| | | ||||||
* | | Fix some warnings on 3-2-stable | kennyj | 2012-02-21 | 4 | -25/+27 | |
|/ | ||||||
* | Fix a failing test | Santiago Pastorino | 2012-02-20 | 1 | -0/+2 | |
| | ||||||
* | Use the right format when a partial is missing. | Santiago Pastorino | 2012-02-20 | 3 | -0/+9 | |
| | | | | Closes #5025 | |||||
* | Reset memoized hash keys when new entry added | Chris Kelly | 2012-02-20 | 2 | -0/+7 | |
| | ||||||
* | search private / protected methods in trunk ruby | Aaron Patterson | 2012-02-20 | 1 | -1/+1 | |
| | ||||||
* | Remove fixture files with Windows incompatible filenames | Andrew White | 2012-02-20 | 13 | -39/+88 | |
| | | | | | | Windows doesn't allow `\ / : * ? " < > |` in filenames so create the fixture files at runtime and ignore the incompatible ones when running on Windows. | |||||
* | Fix actionpack readme weblog example | Alexey Vakhov | 2012-02-18 | 1 | -1/+1 | |
| | ||||||
* | Simplify regexp | Andrew White | 2012-02-17 | 1 | -1/+1 | |
| | ||||||
* | Fix ActionDispatch::Static to serve files with unencoded PCHAR | Andrew White | 2012-02-17 | 14 | -2/+50 | |
| | | | | | | | | | | | RFC 3986[1] allows sub-delim characters in path segments unencoded, however Rack::File requires them to be encoded so we use URI's unescape method to leave them alone and then escape them again. Also since the path gets passed to Dir[] we need to escape any glob characters in the path. [1]: http://www.ietf.org/rfc/rfc3986.txt | |||||
* | backporting #4918 to 3.2 stable; adding extra test for accept header given ↵ | Aditya Sanghi | 2012-02-17 | 2 | -1/+15 | |
| | | | | by googlebot | |||||
* | adding tests to document behavior for #4817 | Aaron Patterson | 2012-02-14 | 1 | -0/+26 | |
| | ||||||
* | Rack body respond to each and not to join | Santiago Pastorino | 2012-02-14 | 2 | -2/+16 | |
| | | | | | | | This fixes undef `to_str' for Rack::Chunked::Body when using caches_action + streaming on an action Closes #5027 | |||||
* | Merge pull request #4988 from kennyj/fix_4720-3 | Aaron Patterson | 2012-02-10 | 2 | -0/+31 | |
| | | | | Fix GH #4720. Routing problem with nested namespace and already camelized controller option. | |||||
* | Added unit test to cover changes to RouteSet.url_for | Ryan McGeary | 2012-02-07 | 1 | -0/+16 | |
| | | | | | ActionDispatch::Routing::RouteSet.url_for now handles passing params through to ActionDispatch::Http::Url.url_for | |||||
* | Fixed force_ssl redirects to include original query params | Ryan McGeary | 2012-02-06 | 3 | -0/+8 | |
| | | | | | | `ActionController.force_ssl` redirects http URLs to their https equivalent; however, when a URL contains a query string, the resulting redirect lacked the original query string. | |||||
* | Merge pull request #4908 from kennyj/fix_3864 | José Valim | 2012-02-06 | 2 | -1/+34 | |
| | | | | Fix url_for method's behavior. GH #3684. | |||||
* | Clean up a bit default_response handling and cache format negotiation. | José Valim | 2012-02-04 | 2 | -19/+17 | |
| | ||||||
* | Merge pull request #4870 from sikachu/3-2-stable-responder-fix | José Valim | 2012-02-04 | 4 | -8/+60 | |
|\ | | | | | Fix override API response bug in respond_with | |||||
| * | Fix override API response bug in respond_with | Prem Sichanugrist | 2012-02-03 | 4 | -8/+60 | |
| | | | | | | | | | | | | | | | | | | | | Default responder was only using the given respond block when user requested for HTML format, or JSON/XML format with valid resource. This fix the responder so that it will use the given block regardless of the validity of the resource. Note that in this case you'll have to check for object's validity by yourself in the controller. Fixes #4796 | |||||
* | | Merge pull request #4879 from kennyj/fix_4873 | José Valim | 2012-02-04 | 2 | -2/+9 | |
|/ | | | | Fix GH #4873. Allow swapping same class middleware. | |||||
* | Merge pull request #4735 from arton/master | Aaron Patterson | 2012-01-31 | 1 | -1/+5 | |
| | | | | Re-launch assets:precompile task using original $0 if $0 is batch file so it works on Windows | |||||
* | Merge check box fixes from remote-tracking branch ↵ | José Valim | 2012-01-27 | 3 | -5/+18 | |
|\ | | | | | | | 'cantonio/checkbox-hidden-backport' into 3-2-stable | |||||
| * | don't set the hidden checkbox value if it's nil | Damien Mathieu | 2012-01-27 | 2 | -1/+9 | |
| | | ||||||
| * | check_box helper with :disabled => true generates disabled hidden field. ↵ | Tadas Tamošauskas | 2012-01-27 | 3 | -5/+8 | |
|/ | | | | fixes #1953 | |||||
* | updating RAILS_VERSION | Xavier Noria | 2012-01-26 | 1 | -1/+1 | |
| | ||||||
* | CHANGELOG revision for v3.2.1 | Xavier Noria | 2012-01-26 | 1 | -0/+9 | |
| |