Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1798 from jeroenj/cachesweeper-fix | Santiago Pastorino | 2011-06-22 | 1 | -0/+1 |
|\ | | | | | Fixes an issue where cache sweepers with only after filters would have no controller object | ||||
| * | Fixes an issue where cache sweepers with only after filters would have no ↵ | Jeroen Jacobs | 2011-06-21 | 1 | -0/+1 |
| | | | | | | | | | | | | controller object It would raise undefined method controller_name for nil | ||||
* | | Merge pull request #1778 from spohlenz/hash-models | José Valim | 2011-06-22 | 1 | -1/+1 |
|\ \ | | | | | | | Fix nested fields_for when Hash-based model is passed. | ||||
| * | | Test for extractable_options? within nested fields_for. | Sam Pohlenz | 2011-06-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | This fixes an error when a record object that is a subclass of Hash is passed to fields_for, which is incorrectly interpreted as field options. | ||||
* | | | Require helpers so autoload is properly setup. | José Valim | 2011-06-21 | 1 | -1/+1 |
| | | | |||||
* | | | Don't use deprecated stuff. | José Valim | 2011-06-21 | 1 | -2/+1 |
| | | | |||||
* | | | Assign Rails.cache to sprockets | Joshua Peek | 2011-06-21 | 1 | -0/+4 |
| | | | |||||
* | | | Rename AV::Helpers::AssetPaths to AV::AssetPaths to solve autoload mess. | José Valim | 2011-06-21 | 4 | -81/+84 |
| |/ |/| | |||||
* | | Only mark the sliced buffer as safe, if it was safe to begin with. | Christopher Meiklejohn | 2011-06-20 | 1 | -1/+2 |
| | | |||||
* | | Streamline fragment_for SafeBuffer logic to make it more concise. | Christopher Meiklejohn | 2011-06-20 | 1 | -6/+3 |
| | | |||||
* | | Do not change a frozen text passed to simple_format text helper | Tadas Tamosauskas | 2011-06-20 | 1 | -0/+1 |
|/ | |||||
* | Call super here to allow SessionHash initialize new stuff for us | Santiago Pastorino | 2011-06-19 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-06-18 | 3 | -12/+17 |
|\ | |||||
| * | Typo. | R.T. Lechow | 2011-06-16 | 1 | -2/+2 |
| | | |||||
| * | form => form_for | Vijay Dev | 2011-06-15 | 1 | -1/+1 |
| | | |||||
| * | Tweak linebreak in ActionController::Redirecting doc | Christine Yen | 2011-06-15 | 1 | -2/+2 |
| | | |||||
| * | Clarify importance of *_attributes= writer methods for nested fields | Christine Yen | 2011-06-15 | 1 | -8/+12 |
| | | |||||
| * | Improve documentation around status code argument of redirect_to | Christine Yen | 2011-06-15 | 1 | -1/+2 |
| | | |||||
| * | cycle: make an odd number be marked as odd. | Robert Massaioli | 2011-06-13 | 1 | -1/+1 |
| | | | | | | | | Just a minor issue that was annoying me so I thought that I would jump in and fix it. | ||||
* | | Select tag helpers: remove some code dups | Bogdan Gusiev | 2011-06-17 | 1 | -25/+10 |
| | | |||||
* | | Make the API for compression consistent between JS and CSS. By default, ↵ | wycats | 2011-06-16 | 1 | -2/+6 |
| | | | | | | | | | | | | users just need to say whether they want compression or not, and a default will be chosen by a Railtie. In the case of CSS, this default is already chosen by the sass-rails gem. Users can still explicitly choose a compressor in their application.rb if they have a preference, but will usually want to let plugins choose defaults in their Railties. | ||||
* | | Use html_safe | Santiago Pastorino | 2011-06-16 | 1 | -2/+2 |
| | | |||||
* | | Remove usage of memoizable from ActionPack. | José Valim | 2011-06-16 | 2 | -10/+9 |
| | | |||||
* | | Also change the default route comment | Wen-Tien Chang | 2011-06-16 | 1 | -1/+1 |
| | | |||||
* | | simplify to only one condition | Damien Mathieu | 2011-06-15 | 1 | -5/+1 |
| | | | | | | | | Signed-off-by: Andrew White <andyw@pixeltrix.co.uk> | ||||
* | | Make MissingTranslation exception handler respect :rescue_format | Andrew White | 2011-06-15 | 1 | -1/+5 |
| | | |||||
* | | Fix appending sprockets paths | Joshua Peek | 2011-06-14 | 1 | -1/+6 |
| | | |||||
* | | Removed warning while running test with ruby 1.9.2 | bagwanpankaj | 2011-06-14 | 1 | -1/+1 |
| | | |||||
* | | all requests are utf-8. Don't use the external encoding. | Damien Mathieu | 2011-06-14 | 1 | -3/+2 |
| | | |||||
* | | encode the uploaded file's name in the default external encoding - Closes #869 | Damien Mathieu | 2011-06-14 | 1 | -1/+12 |
| | | |||||
* | | Merge pull request #1552 from bogdan/select | Piotr Sarnacki | 2011-06-11 | 1 | -6/+37 |
|\ \ | | | | | | | Fixing select[multiple] html specification problem. | ||||
| * | | Fixing select[multiple] html specification problem. | Bogdan Gusiev | 2011-06-08 | 1 | -6/+37 |
| | | | | | | | | | | | | Generating hidden input with same name before each multiple select | ||||
* | | | No need for a configuration option here. | José Valim | 2011-06-11 | 1 | -10/+2 |
| | | | |||||
* | | | Remove utf8_enforcer_param config option | David Lee | 2011-06-11 | 1 | -7/+0 |
| | | | |||||
* | | | Make utf8_enforcer_tag an overrideable method | David Lee | 2011-06-11 | 1 | -3/+7 |
| | | | |||||
* | | | Make utf8 enforcer param customizeable | David Lee | 2011-06-11 | 3 | -4/+18 |
| | | | |||||
* | | | There are no snowmen here | David Lee | 2011-06-11 | 1 | -3/+3 |
| | | | |||||
* | | | Revert "Make sure that we don't perform in-place mutation on SafeBuffer string" | Santiago Pastorino and José Ignacio Costa | 2011-06-10 | 1 | -3/+0 |
| | | | | | | | | | | | | This reverts commit 115e80dccc65c3ed9a9750649d9ca4ea2a7e64f1. | ||||
* | | | Merge pull request #1642 from sikachu/master-render-inline | Aaron Patterson | 2011-06-10 | 1 | -0/+3 |
|\ \ \ | |_|/ |/| | | Render inline fix for master | ||||
| * | | Make sure that we don't perform in-place mutation on SafeBuffer string | Prem Sichanugrist | 2011-06-10 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | This will make sure `render :inline` is working. Closes #1633 | ||||
* | | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-06-11 | 1 | -3/+3 |
|\ \ \ | |/ / |/| | | |||||
| * | | shallow_path example updated | ganesh | 2011-06-10 | 1 | -3/+3 |
| | | | |||||
* | | | Ensure number helpers can handle HTML safe strings - closes #1597. | Andrew White | 2011-06-10 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #1523 from raghunadhd/refactor_regex | Xavier Noria | 2011-06-10 | 1 | -4/+7 |
|\ \ \ | | | | | | | | | rafactored the regex related code in the mapper class | ||||
| * | | | removed the unnecessary back slashes from the regular expression | Raghunadh | 2011-06-10 | 1 | -2/+2 |
| | | | | |||||
| * | | | rafactored the regex related code in the mapper class | Raghunadh | 2011-06-07 | 1 | -4/+7 |
| | | | | |||||
* | | | | Make sure `escape_javascript` return `SafeBuffer` if the incoming argument ↵ | Prem Sichanugrist | 2011-06-09 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | is already html_safe | ||||
* | | | | Indention style + whitespace for readability | David Heinemeier Hansson | 2011-06-09 | 1 | -33/+38 |
| | | | | |||||
* | | | | If you set a js_compressor, it means that you want shit compressed -- we ↵ | David Heinemeier Hansson | 2011-06-09 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | dont need a second option to turn that on | ||||
* | | | | Make escape_javascript happy to handle SafeBuffers | Paul Gallagher | 2011-06-08 | 1 | -1/+1 |
| |_|/ |/| | | | | | | | | | | | * see GH#1553 * allow for the fact that gsub on SafeBuffer does not pass match variables $1, $2 etc to a block |