| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 | ||||
| * | | Merge pull request #4879 from kennyj/fix_4873 | José Valim | 2012-02-04 | 1 | -2/+3 |
| |/ | | | | 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 | ||||
| * | don't set the hidden checkbox value if it's nil | Damien Mathieu | 2012-01-27 | 1 | -1/+1 |
| | | |||||
| * | check_box helper with :disabled => true generates disabled hidden field. ↵ | Tadas Tamošauskas | 2012-01-27 | 1 | -1/+1 |
| | | | | | fixes #1953 | ||||
| * | updating RAILS_VERSION | Xavier Noria | 2012-01-26 | 1 | -1/+1 |
| | | |||||
| * | Revert usage of safe constantize | José Valim | 2012-01-26 | 1 | -1/+3 |
| | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | remove extra 'the' | Rohit Arondekar | 2012-01-26 | 1 | -1/+1 |
| | | |||||
| * | example bracket error | Damian Le Nouaille | 2012-01-26 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #4639 from joevandyk/datetime-infinity-select-fix | Aaron Patterson | 2012-01-24 | 1 | -1/+1 |
| |\ | | | | | datetime_select fix for dates of -infinity and +infinity | ||||
| | * | datetime_select should work with -/+ infinity dates | Joe Van Dyk | 2012-01-24 | 1 | -1/+1 |
| | | | |||||
| * | | Fix date_select with discard_month and discard_year options | Rafael Mendonça França | 2012-01-24 | 1 | -2/+2 |
| | | | | | | | | | Closes #4553 and #4633 | ||||
| * | | Fix date_select nil and blank and order case | Indrek Juhkam | 2012-01-24 | 1 | -1/+1 |
| |/ | |||||
| * | Added custom regexps to ASTs that have literal nodes on either side of | Aaron Patterson | 2012-01-23 | 1 | -1/+20 |
| | | | | | symbol nodes. Fixes #4585 | ||||
| * | Merge pull request #4604 from ihid/3-2-stable | José Valim | 2012-01-22 | 1 | -0/+1 |
| |\ | | | | | 3-2-stable: Fixed regression - unable to use a range as choices for form.select. | ||||
| | * | Allow form.select to accept ranges. | Jeremy Walker | 2012-01-22 | 1 | -0/+1 |
| | | | |||||
| * | | document `:raise` option support for several helpers [ci skip] | Jonathan Roes | 2012-01-21 | 1 | -0/+3 |
| |/ | |||||
| * | Preparing for 3.2.0 release | David Heinemeier Hansson | 2012-01-20 | 1 | -1/+1 |
| | | |||||
| * | Do not deprecate performed? | José Valim | 2012-01-19 | 2 | -6/+4 |
| | | |||||
| * | Fix small typo in mail_to docs in url_helper.rb | Simon Baird | 2012-01-19 | 1 | -1/+1 |
| | | |||||
| * | Silent Sprockets logger when config.assets.logger is set to false | Guillermo Iguaran | 2012-01-18 | 1 | -1/+4 |
| | | |||||
| * | Remove duplicated constant definition | Carlos Antonio da Silva | 2012-01-17 | 1 | -3/+0 |
| | | | | | | ActionController::ActionControllerError is already defined in action_controller/metal/exceptions. | ||||
| * | Deprecate AC::UnknownError and AC::DoubleRenderError | Carlos Antonio da Silva | 2012-01-17 | 1 | -2/+2 |
| | | | | | | Use the constants AbstractController::ActionNotFound and AbstractController::DoubleRenderError respectively instead. | ||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |