aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6293 from carlosantoniodasilva/render-partial-refactorJosé Valim2012-05-132-38/+37
|\ | | | | Improve and cleanup a bit partial renderer
| * Improve and cleanup a bit partial rendererCarlos Antonio da Silva2012-05-122-38/+37
| | | | | | | | | | | | | | | | | | | | * Remove template assignment: there is no need for this assignment, given we are rendering a collection with possibly different templates, and a second call to render (with the same instance) would behave differently if the template is set. * Remove segments array in favor of Array#map * Use local vars whenever possible * Cache local template keys, remove defaults from find_template
* | Do not add `:include_blank` option if prompt is presentRafael Mendonça França2012-05-132-3/+10
| |
* | Only set `:include_blank` if the value of this options is not presentRafael Mendonça França2012-05-132-1/+7
| |
* | `:include_blank` should be true if the size option is nilRafael Mendonça França2012-05-133-17/+25
| |
* | Merge pull request #6225 from ↵Rafael Mendonça França2012-05-133-0/+29
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | acapilleri/select_with_required_true_include_first_option_blank HTML5 validation error with options_from_collection_for_select Fixes #5908 Conflicts: actionpack/CHANGELOG.md
| * | Changed the changelog and documentation aboutAngelo Capilleri2012-05-131-0/+3
| | | | | | | | | | | | | | | the select method (tag select) forces :include_blank if is required and no multiple and display size is one
| * | Always include the options :include_blank if the select has a required attributeangelo giovanni capilleri2012-05-132-0/+26
| | | | | | | | | | | | and display size 1 and not multiple attribute, Fixes #5908
* | | Merge pull request #6171 from oscardelben/move_token_tag_if_blockRafael Mendonça França2012-05-121-3/+3
|\ \ \ | |_|/ |/| | Switch token_tag if block
| * | Switch token_tag if blockOscar Del Ben2012-05-051-3/+3
| | |
* | | update example outputs of some asset helpersVijay Dev2012-05-121-18/+18
| | | | | | | | | | | | | | | | | | | | | Changed /images and /fonts to /assets in the examples of image_path, image_tag and font_path helpers [ci skip]
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-121-42/+44
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: activesupport/lib/active_support/callbacks.rb
| * | | Move HTTP Token auth docs above the Token moduleElia Schito2012-05-111-42/+44
| | | |
* | | | Revert "Merge pull request #6142 from spartan-developer/master"José Valim2012-05-124-10/+12
| | | | | | | | | | | | | | | | | | | | This reverts commit 667d0bdd90ef6e6b691f0cc4cf5535b8da69f248, reversing changes made to 4ae6bab6bb02c9390188a49f9a749400f6a0ac94.
* | | | mispelling errors in render_text_test.rb and sqlite_specific_schemaangelo giovanni capilleri2012-05-121-2/+2
| | | |
* | | | Merge pull request #6142 from spartan-developer/masterJosé Valim2012-05-124-12/+10
|\ \ \ \ | | | | | | | | | | refactored extracting :size => 'XxY' into an extract_size! method
| * | | | refactored extracting :size => 'XxY' into an extract_size! methodNicholas Yianilos2012-05-034-12/+10
| | | | |
* | | | | mispelling error in actionpach changelogangelo giovanni capilleri2012-05-121-1/+1
| | | | |
* | | | | Add test directory to TestTask's libsSantiago Pastorino2012-05-111-0/+1
| | | | |
* | | | | Remove useless load path modificationsSantiago Pastorino2012-05-114-18/+0
| | | | |
* | | | | Lazy load I18nSantiago Pastorino2012-05-111-2/+3
| | | | |
* | | | | Move require to where it's neededSantiago Pastorino2012-05-116-3/+6
| | | | |
* | | | | Remove ruby/shimSantiago Pastorino2012-05-112-2/+1
| | | | | | | | | | | | | | | | | | | | require 'action_view' is now much faster
* | | | | Copy literal route constraints to defaults - fixes #3571 and #6224.Andrew White2012-05-114-3/+69
| | | | |
* | | | | Don't ignore nil positional arguments for url helpers - fixes #6196.Andrew White2012-05-102-1/+36
| | | | |
* | | | | Refactor the handling of default_url_options in integration testsAndrew White2012-05-102-7/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit improves the handling of default_url_options in integration tests by making behave closer to how a real application operates. Specifically the following issues have been addressed: * Options specified in routes.rb are used (fixes #546) * Options specified in controllers are used * Request parameters are recalled correctly * Tests can override default_url_options directly
* | | | | remove duplicate usage of Rack::Utils.status_code in ↵Rafael Magana2012-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | LogSubscriber#process_action
* | | | | removing key argument from run_callbacks - fix buildFrancesco Rodriguez2012-05-101-1/+1
| |_|_|/ |/| | |
* | | | Refactor Generator class to not rely on in-place editing the controllerAndrew White2012-05-092-11/+16
| | | |
* | | | Fix bug when url_for changes controller.Nikita Beloglazov2012-05-092-2/+11
| | | |
* | | | fix a couple of formatting issues [ci skip]Vijay Dev2012-05-091-2/+4
| | | |
* | | | update some examples in asset tag helper docs [ci skip]Vijay Dev2012-05-091-15/+15
| | | |
* | | | remove redundant and stray line [ci skip]Vijay Dev2012-05-091-2/+0
| |/ / |/| |
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-085-105/+180
|\ \ \
| * | | Fix NumberHelper options wrapping to prevent verbatim blocks being rendered ↵Mark J. Titorenko2012-05-081-92/+161
| | | | | | | | | | | | | | | | instead of line continuations. While I'm at it, wrap long comment lines consistently.
| * | | Add example for image_submit_tag with confirmation. [ci skip]Edward Tsech2012-05-081-0/+3
| | | |
| * | | Add annotaion for class_eval in AbstractController#helper_method [ci skip]Edward Tsech2012-05-081-3/+3
| | | |
| * | | Improve readability of metaprogramming annotations at AbstractController ↵Edward Tsech2012-05-081-10/+10
| | | | | | | | | | | | | | | | callbacks.
| * | | Added reference to I18n.localize, as discussed here:Ernesto Tagwerker2012-05-041-0/+3
| | | | | | | | | | | | | | | | https://github.com/rails/rails/issues/4027
* | | | Add failing test re #3436 which demonstrates content_type is not respected ↵Kunal Shah2012-05-081-0/+21
| | | | | | | | | | | | | | | | when using the :head method/shortcut
* | | | If content_type is explicitly passed to the :head method use the value or ↵Kunal Shah2012-05-081-1/+2
| | | | | | | | | | | | | | | | fallback
* | | | Add passing tests for generating URLs with nested SCRIPT_NAMEsJeremy Kemper2012-05-072-3/+17
| | | |
* | | | Merge pull request #5368 from andhapp/remove-max-staleJosé Valim2012-05-071-4/+4
|\ \ \ \ | | | | | | | | | | Minor test improvement
| * | | | Removed max-stale from the tests since it's a request cache-control ↵Anuj Dutta2012-03-101-4/+4
| | | | | | | | | | | | | | | | | | | | directive, just for clarity sake.
* | | | | Merge pull request #6182 from shaliko/change_unless_else_into_if_elseJosé Valim2012-05-071-3/+3
|\ \ \ \ \ | | | | | | | | | | | | Change unless + else into if + else
| * | | | | Change unless + else into if + elseShaliko Usubov2012-05-061-3/+3
| | | | | |
* | | | | | Fix that optimized named routes should also work as singleton methods on the ↵Jeremy Kemper2012-05-062-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | url_helpers module
* | | | | | doc edits [ci skip]Vijay Dev2012-05-061-3/+2
| | | | | |
* | | | | | Merge pull request #5924 from cjolly/signed-cookies-docsVijay Dev2012-05-061-3/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Improve signed cookies documentation
| * | | | | Improve signed cookies documentationChad Jolly2012-04-211-3/+5
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-27 17:42:23 +0000