| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | Bumping to 3.2.3.rc1 | Santiago Pastorino | 2012-03-27 | 1 | -2/+2 | |
| | |/ |/| | ||||||
| * | | If partial is rendered in controller, grab format from template | Piotr Sarnacki | 2012-03-27 | 1 | -2/+8 | |
| | | | | | | | | | | | | | | | | | | | Previously `rendered_format` was set only based on mime types passed in Accept header, which was wrong if first type from Accept was different than rendered partial. The fix is to simply move setting rendered_format to the place where template is available and grab format from the template. If it fails we can fallback to formats passed by Accept header. | |||||
| * | | Merge pull request #5597 from carlosantoniodasilva/fix-build-3-2 | José Valim | 2012-03-26 | 1 | -1/+1 | |
| |\ \ | |/ |/| | Fix build for branch 3-2-stable - return the same session hash object | |||||
| | * | Return the same session data object when setting session id | Carlos Antonio da Silva | 2012-03-24 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | Make sure to return the same hash object instead of returning a new one. Returning a new one causes failures on cookie store tests, where it tests for the 'Set-Cookie' header with the session signature. This is due to the hash ordering changes on Ruby 1.8.7-p358. | |||||
| * | | apply form_for namespace option to date_select | Sergey Nartimov | 2012-03-26 | 1 | -1/+4 | |
| |/ | ||||||
| * | Fix GH #5411. When precompiling, params method is undefined. | kennyj | 2012-03-22 | 1 | -1/+1 | |
| | | ||||||
| * | We dont need to merge in the parameters as thats all being reset by the rack ↵ | David Heinemeier Hansson | 2012-03-20 | 1 | -1/+0 | |
| | | | | | headers (and its causing problems for Strong Parameters attempt of wrapping request.parameters because it will change in testing) | |||||
| * | Fix #5440 - multiple render_to_string breaks partials formats | Piotr Sarnacki | 2012-03-17 | 1 | -0/+1 | |
| | | | | | | | | | | This fixes situation where rendering template to string sets `rendered_format` to the format rendered there. This is ok to have consistent formats rendered in partials, but it breaks on next renders if format is explicitly set or on last render where default format does not necessarily need to be the format of first rendered template. | |||||
| * | Merge pull request #5456 from brianmario/redirect-sanitization | Aaron Patterson | 2012-03-15 | 2 | -2/+2 | |
| | | | | | Strip null bytes from Location header | |||||
| * | Merge pull request #5338 from mreinsch/3-2-static_invalid_byte_sequence | Aaron Patterson | 2012-03-15 | 1 | -0/+1 | |
| |\ | | | | | 3 2 static invalid byte sequence | |||||
| | * | fix ArgumentError being raised in case of invalid byte sequences | Michael Reinsch | 2012-03-08 | 1 | -0/+1 | |
| | | | ||||||
| * | | Remove ActionController::TestCase#rescue_action_in_public! | Piotr Sarnacki | 2012-03-15 | 1 | -5/+0 | |
| | | | | | | | | | | | | | This method has no effect since exception handling was moved to middlewares and ActionController tests do not use any middlewares. | |||||
| * | | Allow you to force the authenticity_token to be rendered even on remote ↵ | David Heinemeier Hansson | 2012-03-14 | 1 | -5/+9 | |
| | | | | | | | | | forms if you pass true | |||||
| * | | Do not include the authenticity token in forms where remote: true as ajax ↵ | David Heinemeier Hansson | 2012-03-14 | 1 | -2/+9 | |
| | | | | | | | | | forms use the meta-tag value | |||||
| * | | Fix layout method doc formatting | Alexey Vakhov | 2012-03-13 | 1 | -2/+1 | |
| |/ | ||||||
| * | Remove usage of deprecated module. | José Valim | 2012-03-07 | 1 | -1/+0 | |
| | | ||||||
| * | Set the rendered_format on respond_to. | José Valim | 2012-03-07 | 1 | -0/+1 | |
| | | ||||||
| * | Just change the formats on first render, closes #5307, closes #5308. | José Valim | 2012-03-07 | 1 | -2/+7 | |
| | | ||||||
| * | Deprecate ActionController::SessionManagement | Santiago Pastorino | 2012-03-06 | 1 | -0/+5 | |
| | | ||||||
| * | Always passing a respond block from to responder | Prem Sichanugrist | 2012-03-05 | 2 | -12/+13 | |
| | | | | | | | | We should let the responder to decide what to do with the given overridden response block, and not short circuit it. Fixes #5280 | |||||
| * | Turn off verbose mode of rack-cache, we still have X-Rack-Cache to check ↵ | Santiago Pastorino | 2012-03-03 | 1 | -1/+1 | |
| | | | | | | | that info Closes #5245 | |||||
| * | Fix #5238, rendered_format is not set when template is not rendered | Piotr Sarnacki | 2012-03-02 | 1 | -0/+2 | |
| | | ||||||
| * | Merge branch '3-2-2' into 3-2-stable | Aaron Patterson | 2012-03-01 | 3 | -5/+5 | |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | 2 | -4/+4 | |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | 1 | -3/+3 | |
| | | | | ||||||
| | * | | 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 | 1 | -1/+1 | |
| | | | | | | | | | | | | | Closes #393 | |||||
| * | | | Fix typo in match :to docs | Justin Woodbridge | 2012-02-25 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | 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... | |||||
| * | | format lookup for partials is derived from the format in which the template ↵ | Santiago Pastorino | 2012-02-22 | 7 | -30/+14 | |
| | | | | | | | | | | | | | 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 | 1 | -9/+11 | |
| | | | ||||||
| * | | Restore lookup formats to the previous value after searching for the failing ↵ | Santiago Pastorino | 2012-02-21 | 1 | -1/+3 | |
| |/ | | | | view | |||||
| * | Use the right format when a partial is missing. | Santiago Pastorino | 2012-02-20 | 1 | -0/+1 | |
| | | | | | Closes #5025 | |||||
| * | Reset memoized hash keys when new entry added | Chris Kelly | 2012-02-20 | 1 | -0/+1 | |
| | | ||||||
| * | search private / protected methods in trunk ruby | Aaron Patterson | 2012-02-20 | 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 | 1 | -2/+10 | |
| | | | | | | | | | | | | 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 | 1 | -1/+3 | |
| | | | | | by googlebot | |||||
| * | Rack body respond to each and not to join | Santiago Pastorino | 2012-02-14 | 1 | -2/+4 | |
| | | | | | | | | 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 | 1 | -0/+5 | |
| | | | | | Fix GH #4720. Routing problem with nested namespace and already camelized controller option. | |||||
| * | Fixed force_ssl redirects to include original query params | Ryan McGeary | 2012-02-06 | 2 | -0/+2 | |
| | | | | | | | `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 | 1 | -1/+1 | |
| | | | | | 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 | 1 | -8/+23 | |
| |\ | | | | | Fix override API response bug in respond_with | |||||
| | * | Fix override API response bug in respond_with | Prem Sichanugrist | 2012-02-03 | 1 | -8/+23 | |
| | | | | | | | | | | | | | | | | | | | | | 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 | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |