aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Olli Jokinen2011-12-01180-6991/+9152
|\
| * Update CHANGELOG.José Valim2011-12-011-1/+3
| |
| * Leave default_asset_host_protocol unsetJonathan del Strother2011-12-011-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 fixVijay Dev2011-12-011-1/+1
| |
| * fix exception page when template contains utf-8 and parameters contain utf-8lest2011-11-301-1/+5
| |
| * Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-11-302-7/+7
| |\
| | * Fixing incorrect documentation Aviv Ben-Yosef2011-11-301-2/+2
| | | | | | | | | `path_names` can only be used for affecting `new` and `edit`
| | * Fix ActionDispatch::Request method explanationsTravis Pew2011-11-281-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 testslest2011-11-303-12/+5
| | |
| * | fix warning in tests when using render_erb helperlest2011-11-301-0/+2
| | |
| * | test helpers in erb using erblest2011-11-306-17/+31
| | |
| * | Log 'Filter chain halted as CALLBACKNAME rendered or redirected' every time ↵José Valim2011-11-304-2/+24
| | | | | | | | | | | | a before callback halts.
| * | Update sprockets which theoretically fixes the regression we have seen.José Valim2011-11-301-1/+1
| | |
| * | Fixes for using action view template in isolation.José Valim2011-11-303-2/+12
| | |
| * | Deprecate set_sequence_name in favour of self.sequence_name=Jon Leighton2011-11-291-2/+2
| | |
| * | Deprecate set_table_name in favour of self.table_name= or defining your own ↵Jon Leighton2011-11-292-9/+9
| | | | | | | | | | | | method.
| * | Handle correctly optional parameters for callable asset_host.Marc-Andre Lafortune2011-11-292-2/+10
| | |
| * | put backtrace_cleaner to envlest2011-11-282-13/+20
| | |
| * | Revert "use any? to check for size"Vijay Dev2011-11-281-1/+1
| | | | | | | | | | | | This reverts commit c4af5f00f602b9e1c3166872902265836daf321b.
| * | update CHANGELOGVasiliy Ermolovich2011-11-281-0/+10
| | |
| * | add namespace options to form_forVasiliy Ermolovich2011-11-272-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 erblest2011-11-273-2/+13
| |/
| * Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-11-262-3/+3
| |\
| | * use any? to check for sizeVijay Dev2011-11-261-1/+1
| | |
| | * what's -> that'sUģis Ozols2011-11-251-1/+1
| | |
| | * Remove unnecessary comment.Uģis Ozols2011-11-251-1/+1
| | |
| | * - Avoid using .first since it will create an additional query. Marc Chung2011-11-221-1/+1
| | | | | | | | | - Handle scenario where @posts is empty.
| * | removes a Serialization constant left in the previous revertXavier Noria2011-11-251-1/+0
| | |
| * | Revert the serializers API as other alternatives are now also under discussionJosé Valim2011-11-253-100/+0
| | |
| * | Merge pull request #3747 from lest/middleware-loggerJosé Valim2011-11-256-31/+34
| |\ \ | | | | | | | | middlewares should have configurable logger
| | * | middlewares should use logger from envlest2011-11-256-31/+34
| | | |
| * | | Merge branch 'serializers'José Valim2011-11-255-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é Valim2011-11-251-0/+23
| | | |
| | * | Rely solely on active_model_serializer and remove the fancy constant lookup.José Valim2011-11-232-2/+18
| | | |
| | * | Merge branch 'master' into serializersJosé Valim2011-11-2366-6072/+6766
| | |\ \
| | * | | Refactor to make renderers a SetJose and Yehuda2011-10-151-11/+9
| | | | |
| | * | | Initial commit of serializer supportJose and Yehuda2011-10-154-0/+62
| | | | |
| * | | | configuration option to always write cookielest2011-11-233-4/+9
| | | | |
| * | | | Merge pull request #3733 from kennyj/fix_warnings_for_show_exceptions_testYehuda Katz2011-11-231-3/+3
| |\ \ \ \ | | |_|/ / | |/| | | Warnings removed. (ambiguous first argument)
| | * | | Warnings removed. (ambiguous first argument)kennyj2011-11-241-3/+3
| | | | |
| * | | | Rely on a public contract between railties instead of accessing railtie ↵José Valim2011-11-235-12/+11
| | | | | | | | | | | | | | | | | | | | methods directly.
| * | | | Remove unreachable code, and add additional testcases.kennyj2011-11-243-6/+25
| |/ / /
| * | | Merge pull request #3724 from marcandre/media_defaultYehuda Katz2011-11-221-0/+3
| |\ \ \ | | | | | | | | | | stylesheet_tag default's media is "screen"
| | * | | Make explicit the default media when calling stylesheet_tag and change the ↵Marc-Andre Lafortune2011-11-221-0/+3
| | | | | | | | | | | | | | | | | | | | default generators.
| * | | | Merge pull request #3718 from lest/fix-javascript-include-tagJosé Valim2011-11-222-1/+4
| |\ \ \ \ | | | | | | | | | | | | javascript_include_tag should add '.js' to sources that contain '.'
| | * | | | javascript_include_tag should add '.js' to sources that contain '.'lest2011-11-222-1/+4
| | | | | |
| * | | | | deprecation warning, changelog entrylest2011-11-222-1/+7
| | | | | |
| * | | | | move show_detailed_exceptions? to Rescue modulelest2011-11-224-7/+14
| | | | | |
| * | | | | refactor show exceptions testslest2011-11-222-42/+78
| | | | | |
| * | | | | add ActionController::Metal#show_detailed_exceptions?lest2011-11-223-28/+38
| |/ / / /