Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-03-09 | 1 | -0/+10 |
|\ | |||||
| * | copy edits [ci skip] | Vijay Dev | 2012-03-07 | 1 | -2/+2 |
| | | |||||
| * | Add some docs for ActionController::Base.without_modules | Carlos Antonio da Silva | 2012-03-06 | 1 | -0/+10 |
| | | |||||
* | | Set the rendered_format on respond_to. | José Valim | 2012-03-07 | 1 | -0/+1 |
| | | |||||
* | | Just change the formats on first render, closes #5307, closes #5308. | José Valim | 2012-03-07 | 1 | -2/+7 |
| | | |||||
* | | Merge pull request #5310 from Serabe/layout_for_partials_with_collections | José Valim | 2012-03-06 | 1 | -1/+46 |
|\ \ | | | | | | | Adds :layout option to render :partial when a collection is given. | ||||
| * | | Adds line to change log and update documentation. | Sergio Arbeo | 2012-03-07 | 1 | -0/+37 |
| | | | |||||
| * | | Adds :layout option to render :partial when a collection is given. | Sergio Arbeo | 2012-03-06 | 1 | -1/+9 |
| | | | |||||
* | | | Refactor AD::UploadedFile, and raise sooner if tempfile is not present | Carlos Antonio da Silva | 2012-03-06 | 1 | -8/+6 |
| | | | |||||
* | | | 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. | ||||
* | | | Merge pull request #5298 from sikachu/master-fix-responder | José Valim | 2012-03-06 | 2 | -12/+13 |
|\ \ \ | | | | | | | | | 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 | ||||
* / / | Compute asset paths from the request if ENV["RAILS_RELATIVE_URL_ROOT"] is ↵ | Dwayne Litzenberger | 2012-03-05 | 1 | -1/+1 |
|/ / | | | | | | | | | | | | | | | | | 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 | 1 | -3/+3 |
|\ \ | | | | | | | Added parsing of arbitrary media type parameters. | ||||
| * | | Added parsing of arbitrary media type parameters. | Steve Klabnik | 2012-03-05 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | Based on #4918. Related to #4127. | ||||
* | | | force response body to be read in assert_template | Sergey Nartimov | 2012-03-05 | 1 | -0/+4 |
|/ / | |||||
* | | Route root helper shortcut | Brian Cardarella | 2012-03-03 | 1 | -0/+5 |
| | | | | | | | | 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 | 6 | -39/+98 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | 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 | 3 | -20/+27 |
| | | | |||||
| * | | 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 | 1 | -0/+2 |
| | | | |||||
* | | | Allow fieldsets to be created without a block. | Ben Pickles | 2012-03-01 | 1 | -2/+1 |
|/ / | |||||
* | | Merge branch 'master-security' | Aaron Patterson | 2012-03-01 | 2 | -4/+3 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | 1 | -3/+3 |
| | | | |||||
* | | | 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 | 1 | -0/+4 |
|\ \ \ | | | | | | | | | Fix layout lookup for anonymous controller | ||||
| * | | | Fix layout lookup for anonymous controller | Alexey Vakhov | 2012-02-28 | 1 | -0/+4 |
| | |/ | |/| | |||||
* | | | Merge pull request #5219 from ↵ | Aaron Patterson | 2012-02-29 | 2 | -4/+5 |
|\ \ \ | | | | | | | | | | | | | | | | | 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 | 2 | -4/+5 |
| | | | | | | | | | | | | | | | | 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 | 1 | -1/+1 |
| | | | | | | | | | | | | Closes #393 | ||||
* | | | Fix collection_check_boxes and collection_radio_buttons when using local | Rafael Mendonça França | 2012-02-26 | 1 | -0/+1 |
| | | | | | | | | | | | | variables in the form builder | ||||
* | | | Add documentation to object method of CollectionHelpers::Builder | Rafael Mendonça França | 2012-02-26 | 1 | -6/+6 |
| | | | |||||
* | | | use content_tag instead strings | Vasiliy Ermolovich | 2012-02-25 | 1 | -3/+4 |
| | | | |||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-02-25 | 2 | -2/+2 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: actionmailer/CHANGELOG.md |