aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Minor changelog fixes [ci skip]Vijay Dev2012-03-091-1/+1
|
* Fix my name in the CHANGELOG to follow the conventionRafael Mendonça França2012-03-091-10/+16
| | | | Also add missing entries and use the formating convention
* fix incorrect changelog headings [ci skip].Vijay Dev2012-03-091-12/+13
| | | | Last commit message should not have said 'Rails 4' either
* changelog updates for Rails 4 [ci skip]Vijay Dev2012-03-091-0/+12
|
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-091-0/+10
|\
| * copy edits [ci skip]Vijay Dev2012-03-071-2/+2
| |
| * Add some docs for ActionController::Base.without_modulesCarlos Antonio da Silva2012-03-061-0/+10
| |
* | Set the rendered_format on respond_to.José Valim2012-03-071-0/+1
| |
* | Just change the formats on first render, closes #5307, closes #5308.José Valim2012-03-071-2/+7
| |
* | Add test case for #5307Carlos Antonio da Silva2012-03-071-2/+6
| |
* | Merge pull request #5310 from Serabe/layout_for_partials_with_collectionsJosé Valim2012-03-064-1/+53
|\ \ | | | | | | Adds :layout option to render :partial when a collection is given.
| * | Adds line to change log and update documentation.Sergio Arbeo2012-03-072-0/+39
| | |
| * | Adds :layout option to render :partial when a collection is given.Sergio Arbeo2012-03-063-1/+14
| | |
* | | Refactor AD::UploadedFile, and raise sooner if tempfile is not presentCarlos Antonio da Silva2012-03-062-9/+7
| | |
* | | Remove unused ActionController::SessionManagementSantiago Pastorino2012-03-063-11/+0
| | |
* | | Avoid ImplicitRender just call render directlySantiago Pastorino2012-03-061-3/+1
| | |
* | | Clean up module docs [ci skip]Vijay Dev2012-03-072-27/+27
| | | | | | | | | | | | Removed some useless docstrings and no-doc'ed some.
* | | Use latest rack-cache.José Valim2012-03-061-1/+1
| | |
* | | Merge pull request #5298 from sikachu/master-fix-responderJosé Valim2012-03-063-12/+49
|\ \ \ | | | | | | | | Always passing a respond block from to responder
| * | | Always passing a respond block from to responderPrem Sichanugrist2012-03-052-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We should let the responder to decide what to do with the given overridden response block, and not short circuit it. Fixes #5280
| * | | Failing test for mime responder respond_with using a block.Mario Visic2012-03-051-0/+36
| |/ /
* / / Compute asset paths from the request if ENV["RAILS_RELATIVE_URL_ROOT"] is ↵Dwayne Litzenberger2012-03-053-1/+104
|/ / | | | | | | | | | | | | | | | | not set. This should fix the following issue: "Rails is not a Rack Application (SCRIPT_NAME vs. relative_url_root ?)" https://github.com/rails/rails/issues/910
* | Merge pull request #5290 from steveklabnik/masterJosé Valim2012-03-052-3/+9
|\ \ | | | | | | Added parsing of arbitrary media type parameters.
| * | Added parsing of arbitrary media type parameters.Steve Klabnik2012-03-052-3/+9
| | | | | | | | | | | | | | | | | | Based on #4918. Related to #4127.
* | | force response body to be read in assert_templateSergey Nartimov2012-03-052-0/+17
| | |
* | | document the shortcut to the root route helper [ci skip]Vijay Dev2012-03-051-0/+2
|/ / | | | | | | This was implemented in 2ee4dd856d47113625589bc5410b5a6669ea02d5
* | Merge pull request #5269 from ↵Piotr Sarnacki2012-03-041-1/+0
|\ \ | | | | | | | | | | | | castlerock/remove_unwanted_require_karnel_reporting AS/kernel/reporting no where used in ts_isolated
| * | AS/kernel/reporting no where used in ts_isolatedVishnu Atrai2012-03-041-1/+0
| | |
* | | Route root helper shortcutBrian Cardarella2012-03-032-0/+14
|/ / | | | | | | Allow the root route helper to accept just a string
* | Merge pull request #5246 from lest/patch-2José Valim2012-03-031-1/+1
|\ \ | | | | | | simplify namespace assignment in fields_for
| * | simplify namespace assignment in fields_forSergey Nartimov2012-03-021-1/+1
| | |
* | | remove usages of AS::OrderedHashVishnu Atrai2012-03-031-1/+1
| |/ |/|
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-031-1/+1
|\ \
| * | Removed max-stale from the setting the cache-headers in the response as ↵Anuj Dutta2012-03-021-1/+1
| | | | | | | | | | | | max-stale is a cache request header.
* | | Turn off verbose mode of rack-cache, we still have X-Rack-Cache to check ↵Santiago Pastorino2012-03-031-1/+1
| |/ |/| | | | | | | | | that info Closes #5245
* | Can't cache url_options on a controller levelPiotr Sarnacki2012-03-021-11/+12
| | | | | | | | | | It fails if routes from to railties are called in one context, for example: blog.posts_path and main_app.users_path
* | don't pass unnecessary argumentSergey Nartimov2012-03-021-2/+2
| |
* | Merge pull request #5242 from rails/opt_routesJosé Valim2012-03-029-48/+107
|\ \ | | | | | | | | | | | | | | | | | | | | | Optimize routes generation in simple cases. If you pass to the route helper the same amount of arguments as the required segments, route generation will be optimized as a string interpolation. After this commit, `post_path(post)` is about 6.5 times faster, `post_url(post)` is about 5 times.
| * | Optimize url helpers.Sergey Nartimov + José Valim2012-03-026-29/+36
| | |
| * | Optimize path helpers.José Valim2012-03-025-29/+81
| | |
* | | Fix #5238, rendered_format is not set when template is not renderedPiotr Sarnacki2012-03-022-2/+8
| | |
* | | Allow fieldsets to be created without a block.Ben Pickles2012-03-012-2/+11
|/ /
* | Add release dates to documentationclaudiob2012-03-011-3/+3
| | | | | | | | Set "March 1, 2012" as the release date for 3.2.2, 3.1.4, 3.0.12
* | Merge branch 'master-security'Aaron Patterson2012-03-013-5/+11
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master-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 Conflicts: actionpack/lib/action_view/helpers/tags/base.rb
| * | use AS::SafeBuffer#clone_empty for flushing the output_bufferAkira Matsuda2012-02-201-1/+1
| | |
| * | fix output safety issue with select optionsSergey Nartimov2012-02-202-4/+11
| | |
* | | Tap, tap goes the middlewareJeremy Kemper2012-02-291-4/+1
| | |
* | | Merge pull request #5203 from avakhov/anonymous-controller-layoutAaron Patterson2012-02-292-0/+16
|\ \ \ | | | | | | | | Fix layout lookup for anonymous controller
| * | | Fix layout lookup for anonymous controllerAlexey Vakhov2012-02-282-0/+16
| | |/ | |/|
* | | Merge pull request #5219 from ↵Aaron Patterson2012-02-293-4/+17
|\ \ \ | | | | | | | | | | | | | | | | mattfawcett/2781-fix-querystring-route-constraint-for-testing Fix for #2781