Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' | Olli Jokinen | 2011-12-01 | 180 | -6991/+9152 |
|\ | |||||
| * | Update CHANGELOG. | José Valim | 2011-12-01 | 1 | -1/+3 |
| | | |||||
| * | Leave default_asset_host_protocol unset | Jonathan del Strother | 2011-12-01 | 1 | -2/+0 |
| | | | | | | When default_asset_host_protocol is left as nil, it will use absolute protocols when a request is present, and relative protocols otherwise (eg in asset generation) | ||||
| * | minor typo fix | Vijay Dev | 2011-12-01 | 1 | -1/+1 |
| | | |||||
| * | fix exception page when template contains utf-8 and parameters contain utf-8 | lest | 2011-11-30 | 1 | -1/+5 |
| | | |||||
| * | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-11-30 | 2 | -7/+7 |
| |\ | |||||
| | * | Fixing incorrect documentation | Aviv Ben-Yosef | 2011-11-30 | 1 | -2/+2 |
| | | | | | | | | | `path_names` can only be used for affecting `new` and `edit` | ||||
| | * | Fix ActionDispatch::Request method explanations | Travis Pew | 2011-11-28 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | The methods, "post?", "put?", "head?", etc. contain an incorrect explanation. They state that they are equivalent to request_method == :type, but this is not accurate because the methods convert the string to a symbol. They are actually equivalent to: request_method_symbol == :type | ||||
| * | | fix method redefined warnings in tests | lest | 2011-11-30 | 3 | -12/+5 |
| | | | |||||
| * | | fix warning in tests when using render_erb helper | lest | 2011-11-30 | 1 | -0/+2 |
| | | | |||||
| * | | test helpers in erb using erb | lest | 2011-11-30 | 6 | -17/+31 |
| | | | |||||
| * | | Log 'Filter chain halted as CALLBACKNAME rendered or redirected' every time ↵ | José Valim | 2011-11-30 | 4 | -2/+24 |
| | | | | | | | | | | | | a before callback halts. | ||||
| * | | Update sprockets which theoretically fixes the regression we have seen. | José Valim | 2011-11-30 | 1 | -1/+1 |
| | | | |||||
| * | | Fixes for using action view template in isolation. | José Valim | 2011-11-30 | 3 | -2/+12 |
| | | | |||||
| * | | Deprecate set_sequence_name in favour of self.sequence_name= | Jon Leighton | 2011-11-29 | 1 | -2/+2 |
| | | | |||||
| * | | Deprecate set_table_name in favour of self.table_name= or defining your own ↵ | Jon Leighton | 2011-11-29 | 2 | -9/+9 |
| | | | | | | | | | | | | method. | ||||
| * | | Handle correctly optional parameters for callable asset_host. | Marc-Andre Lafortune | 2011-11-29 | 2 | -2/+10 |
| | | | |||||
| * | | put backtrace_cleaner to env | lest | 2011-11-28 | 2 | -13/+20 |
| | | | |||||
| * | | Revert "use any? to check for size" | Vijay Dev | 2011-11-28 | 1 | -1/+1 |
| | | | | | | | | | | | | This reverts commit c4af5f00f602b9e1c3166872902265836daf321b. | ||||
| * | | update CHANGELOG | Vasiliy Ermolovich | 2011-11-28 | 1 | -0/+10 |
| | | | |||||
| * | | add namespace options to form_for | Vasiliy Ermolovich | 2011-11-27 | 2 | -2/+85 |
| | | | | | | | | | | | | | | | You can provide a namespace for your form to ensure uniqueness of id attributes on form elements. The namespace attribute will be prefixed with underscore on the generate HTML id | ||||
| * | | fix label with block in erb | lest | 2011-11-27 | 3 | -2/+13 |
| |/ | |||||
| * | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-11-26 | 2 | -3/+3 |
| |\ | |||||
| | * | use any? to check for size | Vijay Dev | 2011-11-26 | 1 | -1/+1 |
| | | | |||||
| | * | what's -> that's | Uģis Ozols | 2011-11-25 | 1 | -1/+1 |
| | | | |||||
| | * | Remove unnecessary comment. | Uģis Ozols | 2011-11-25 | 1 | -1/+1 |
| | | | |||||
| | * | - Avoid using .first since it will create an additional query. | Marc Chung | 2011-11-22 | 1 | -1/+1 |
| | | | | | | | | | - Handle scenario where @posts is empty. | ||||
| * | | 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 | 3 | -100/+0 |
| | | | |||||
| * | | Merge pull request #3747 from lest/middleware-logger | José Valim | 2011-11-25 | 6 | -31/+34 |
| |\ \ | | | | | | | | | middlewares should have configurable logger | ||||
| | * | | middlewares should use logger from env | lest | 2011-11-25 | 6 | -31/+34 |
| | | | | |||||
| * | | | Merge branch 'serializers' | José Valim | 2011-11-25 | 5 | -11/+110 |
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | This implements the ActiveModel::Serializer object. Includes code, tests, generators and guides. From José and Yehuda with love. Conflicts: railties/CHANGELOG.md | ||||
| | * | | 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 | 2 | -2/+18 |
| | | | | |||||
| | * | | Merge branch 'master' into serializers | José Valim | 2011-11-23 | 66 | -6072/+6766 |
| | |\ \ | |||||
| | * | | | 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 | 4 | -0/+62 |
| | | | | | |||||
| * | | | | configuration option to always write cookie | lest | 2011-11-23 | 3 | -4/+9 |
| | | | | | |||||
| * | | | | Merge pull request #3733 from kennyj/fix_warnings_for_show_exceptions_test | Yehuda Katz | 2011-11-23 | 1 | -3/+3 |
| |\ \ \ \ | | |_|/ / | |/| | | | Warnings removed. (ambiguous first argument) | ||||
| | * | | | Warnings removed. (ambiguous first argument) | kennyj | 2011-11-24 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Rely on a public contract between railties instead of accessing railtie ↵ | José Valim | 2011-11-23 | 5 | -12/+11 |
| | | | | | | | | | | | | | | | | | | | | methods directly. | ||||
| * | | | | Remove unreachable code, and add additional testcases. | kennyj | 2011-11-24 | 3 | -6/+25 |
| |/ / / | |||||
| * | | | Merge pull request #3724 from marcandre/media_default | Yehuda Katz | 2011-11-22 | 1 | -0/+3 |
| |\ \ \ | | | | | | | | | | | stylesheet_tag default's media is "screen" | ||||
| | * | | | Make explicit the default media when calling stylesheet_tag and change the ↵ | Marc-Andre Lafortune | 2011-11-22 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | default generators. | ||||
| * | | | | Merge pull request #3718 from lest/fix-javascript-include-tag | José Valim | 2011-11-22 | 2 | -1/+4 |
| |\ \ \ \ | | | | | | | | | | | | | javascript_include_tag should add '.js' to sources that contain '.' | ||||
| | * | | | | javascript_include_tag should add '.js' to sources that contain '.' | lest | 2011-11-22 | 2 | -1/+4 |
| | | | | | | |||||
| * | | | | | deprecation warning, changelog entry | lest | 2011-11-22 | 2 | -1/+7 |
| | | | | | | |||||
| * | | | | | move show_detailed_exceptions? to Rescue module | lest | 2011-11-22 | 4 | -7/+14 |
| | | | | | | |||||
| * | | | | | refactor show exceptions tests | lest | 2011-11-22 | 2 | -42/+78 |
| | | | | | | |||||
| * | | | | | add ActionController::Metal#show_detailed_exceptions? | lest | 2011-11-22 | 3 | -28/+38 |
| |/ / / / |