Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #5310 from Serabe/layout_for_partials_with_collections | José Valim | 2012-03-06 | 4 | -1/+53 |
|\ | | | | | Adds :layout option to render :partial when a collection is given. | ||||
| * | Adds line to change log and update documentation. | Sergio Arbeo | 2012-03-07 | 2 | -0/+39 |
| | | |||||
| * | Adds :layout option to render :partial when a collection is given. | Sergio Arbeo | 2012-03-06 | 3 | -1/+14 |
| | | |||||
* | | Refactor AD::UploadedFile, and raise sooner if tempfile is not present | Carlos Antonio da Silva | 2012-03-06 | 2 | -9/+7 |
| | | |||||
* | | Remove unused ActionController::SessionManagement | Santiago Pastorino | 2012-03-06 | 3 | -11/+0 |
| | | |||||
* | | Avoid ImplicitRender just call render directly | Santiago Pastorino | 2012-03-06 | 1 | -3/+1 |
| | | |||||
* | | Clean up module docs [ci skip] | Vijay Dev | 2012-03-07 | 2 | -27/+27 |
| | | | | | | | | Removed some useless docstrings and no-doc'ed some. | ||||
* | | Use latest rack-cache. | José Valim | 2012-03-06 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #5298 from sikachu/master-fix-responder | José Valim | 2012-03-06 | 3 | -12/+49 |
|\ \ | | | | | | | Always passing a respond block from to responder | ||||
| * | | Always passing a respond block from to responder | Prem Sichanugrist | 2012-03-05 | 2 | -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 Visic | 2012-03-05 | 1 | -0/+36 |
| |/ | |||||
* / | Compute asset paths from the request if ENV["RAILS_RELATIVE_URL_ROOT"] is ↵ | Dwayne Litzenberger | 2012-03-05 | 3 | -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/master | José Valim | 2012-03-05 | 2 | -3/+9 |
|\ | | | | | Added parsing of arbitrary media type parameters. | ||||
| * | Added parsing of arbitrary media type parameters. | Steve Klabnik | 2012-03-05 | 2 | -3/+9 |
| | | | | | | | | | | | | Based on #4918. Related to #4127. | ||||
* | | force response body to be read in assert_template | Sergey Nartimov | 2012-03-05 | 2 | -0/+17 |
| | | |||||
* | | document the shortcut to the root route helper [ci skip] | Vijay Dev | 2012-03-05 | 1 | -0/+2 |
|/ | | | | This was implemented in 2ee4dd856d47113625589bc5410b5a6669ea02d5 | ||||
* | Merge pull request #5269 from ↵ | Piotr Sarnacki | 2012-03-04 | 1 | -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_isolated | Vishnu Atrai | 2012-03-04 | 1 | -1/+0 |
| | | |||||
* | | Route root helper shortcut | Brian Cardarella | 2012-03-03 | 2 | -0/+14 |
|/ | | | | Allow the root route helper to accept just a string | ||||
* | Merge pull request #5246 from lest/patch-2 | José Valim | 2012-03-03 | 1 | -1/+1 |
|\ | | | | | simplify namespace assignment in fields_for | ||||
| * | simplify namespace assignment in fields_for | Sergey Nartimov | 2012-03-02 | 1 | -1/+1 |
| | | |||||
* | | remove usages of AS::OrderedHash | Vishnu Atrai | 2012-03-03 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-03-03 | 1 | -1/+1 |
|\ \ | |||||
| * | | Removed max-stale from the setting the cache-headers in the response as ↵ | Anuj Dutta | 2012-03-02 | 1 | -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 Pastorino | 2012-03-03 | 1 | -1/+1 |
| |/ |/| | | | | | | | | | that info Closes #5245 | ||||
* | | Can't cache url_options on a controller level | Piotr Sarnacki | 2012-03-02 | 1 | -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 argument | Sergey Nartimov | 2012-03-02 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #5242 from rails/opt_routes | José Valim | 2012-03-02 | 9 | -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é Valim | 2012-03-02 | 6 | -29/+36 |
| | | | |||||
| * | | Optimize path helpers. | José Valim | 2012-03-02 | 5 | -29/+81 |
| | | | |||||
* | | | Fix #5238, rendered_format is not set when template is not rendered | Piotr Sarnacki | 2012-03-02 | 2 | -2/+8 |
| | | | |||||
* | | | Allow fieldsets to be created without a block. | Ben Pickles | 2012-03-01 | 2 | -2/+11 |
|/ / | |||||
* | | Add release dates to documentation | claudiob | 2012-03-01 | 1 | -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 Patterson | 2012-03-01 | 3 | -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_buffer | Akira Matsuda | 2012-02-20 | 1 | -1/+1 |
| | | | |||||
| * | | fix output safety issue with select options | Sergey Nartimov | 2012-02-20 | 2 | -4/+11 |
| | | | |||||
* | | | Tap, tap goes the middleware | Jeremy Kemper | 2012-02-29 | 1 | -4/+1 |
| | | | |||||
* | | | Merge pull request #5203 from avakhov/anonymous-controller-layout | Aaron Patterson | 2012-02-29 | 2 | -0/+16 |
|\ \ \ | | | | | | | | | Fix layout lookup for anonymous controller | ||||
| * | | | Fix layout lookup for anonymous controller | Alexey Vakhov | 2012-02-28 | 2 | -0/+16 |
| | |/ | |/| | |||||
* | | | Merge pull request #5219 from ↵ | Aaron Patterson | 2012-02-29 | 3 | -4/+17 |
|\ \ \ | | | | | | | | | | | | | | | | | mattfawcett/2781-fix-querystring-route-constraint-for-testing Fix for #2781 | ||||
| * | | | Fix the assert_recognizes test method so that it works when there are | Matt Fawcett | 2012-02-24 | 3 | -4/+17 |
| | | | | | | | | | | | | | | | | constraints on the querystring. Issue #2781 | ||||
* | | | | fix api doc [ci skip] | Vijay Dev | 2012-03-01 | 1 | -1/+1 |
| | | | | |||||
* | | | | adds a nodoc [ci skip] | Vijay Dev | 2012-03-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | We have an empty api doc page otherwise :) | ||||
* | | | | reduced localhost check to two method calls | Aaron Patterson | 2012-02-28 | 1 | -2/+3 |
| | | | | |||||
* | | | | remove unnecessary memcache equire in ActionDispatch::Session::CacheStore | Brian Durand | 2012-02-28 | 1 | -1/+0 |
| |/ / |/| | | |||||
* | | | Change asset_host config language to be more helpful and accurate | Gabe Hollombe | 2012-02-28 | 1 | -2/+3 |
| | | | |||||
* | | | Add a new line after the textarea opening tag. | Rafael Mendonça França | 2012-02-27 | 3 | -38/+38 |
| | | | | | | | | | | | | Closes #393 | ||||
* | | | Fix collection_check_boxes and collection_radio_buttons when using local | Rafael Mendonça França | 2012-02-26 | 2 | -0/+39 |
| | | | | | | | | | | | | variables in the form builder | ||||
* | | | Add documentation to object method of CollectionHelpers::Builder | Rafael Mendonça França | 2012-02-26 | 1 | -6/+6 |
| | | | |||||
* | | | Move all the helpers to protected section | Rafael Mendonça França | 2012-02-26 | 1 | -31/+31 |
| | | |