Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #5310 from Serabe/layout_for_partials_with_collections | José Valim | 2012-03-06 | 2 | -0/+5 |
|\ | | | | | Adds :layout option to render :partial when a collection is given. | ||||
| * | Adds :layout option to render :partial when a collection is given. | Sergio Arbeo | 2012-03-06 | 2 | -0/+5 |
| | | |||||
* | | Refactor AD::UploadedFile, and raise sooner if tempfile is not present | Carlos Antonio da Silva | 2012-03-06 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #5298 from sikachu/master-fix-responder | José Valim | 2012-03-06 | 1 | -0/+36 |
|\ \ | | | | | | | Always passing a respond block from to responder | ||||
| * | | 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 | 2 | -0/+103 |
|/ | | | | | | | | | 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 | -0/+6 |
|\ | | | | | Added parsing of arbitrary media type parameters. | ||||
| * | Added parsing of arbitrary media type parameters. | Steve Klabnik | 2012-03-05 | 1 | -0/+6 |
| | | | | | | | | | | | | Based on #4918. Related to #4127. | ||||
* | | force response body to be read in assert_template | Sergey Nartimov | 2012-03-05 | 1 | -0/+13 |
|/ | |||||
* | 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 | 1 | -0/+9 |
|/ | | | | Allow the root route helper to accept just a string | ||||
* | Merge pull request #5242 from rails/opt_routes | José Valim | 2012-03-02 | 3 | -9/+9 |
|\ | | | | | | | | | | | | | | | 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 | -9/+9 |
| | | |||||
* | | Fix #5238, rendered_format is not set when template is not rendered | Piotr Sarnacki | 2012-03-02 | 1 | -2/+6 |
| | | |||||
* | | Allow fieldsets to be created without a block. | Ben Pickles | 2012-03-01 | 1 | -0/+10 |
|/ | |||||
* | Merge branch 'master-security' | Aaron Patterson | 2012-03-01 | 1 | -1/+8 |
|\ | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
| * | fix output safety issue with select options | Sergey Nartimov | 2012-02-20 | 1 | -1/+8 |
| | | |||||
* | | Merge pull request #5203 from avakhov/anonymous-controller-layout | Aaron Patterson | 2012-02-29 | 1 | -0/+12 |
|\ \ | | | | | | | Fix layout lookup for anonymous controller | ||||
| * | | Fix layout lookup for anonymous controller | Alexey Vakhov | 2012-02-28 | 1 | -0/+12 |
| | | | |||||
* | | | Merge pull request #5219 from ↵ | Aaron Patterson | 2012-02-29 | 1 | -0/+12 |
|\ \ \ | |/ / |/| | | | | | | | | 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 | 1 | -0/+12 |
| | | | | | | | | | | | | constraints on the querystring. Issue #2781 | ||||
* | | | Add a new line after the textarea opening tag. | Rafael Mendonça França | 2012-02-27 | 2 | -37/+37 |
| | | | | | | | | | | | | Closes #393 | ||||
* | | | Fix collection_check_boxes and collection_radio_buttons when using local | Rafael Mendonça França | 2012-02-26 | 1 | -0/+38 |
| | | | | | | | | | | | | variables in the form builder | ||||
* | | | Move all the helpers to protected section | Rafael Mendonça França | 2012-02-26 | 1 | -31/+31 |
| | | | |||||
* | | | Adding tests for non-optional glob parameters | Andrew White | 2012-02-26 | 1 | -2/+27 |
| | | | |||||
* | | | Remove wrong and redundant code. | kennyj | 2012-02-25 | 1 | -6/+4 |
| | | | |||||
* | | | uses PATCH for the forms of persisted records, and routes PATCH and PUT to ↵ | Xavier Noria | 2012-02-24 | 2 | -69/+74 |
| | | | | | | | | | | | | the update action of resources | ||||
* | | | correct fetching :name option in form fields | Vasiliy Ermolovich | 2012-02-23 | 1 | -0/+5 |
|/ / | |||||
* | | SSL should not be disabled by default in any environment. | Pat Allan | 2012-02-23 | 1 | -14/+0 |
| | | |||||
* | | Remove unused global variable in controller filters test | Alexey Vakhov | 2012-02-23 | 1 | -2/+0 |
| | | |||||
* | | add some tests, yay! | Aaron Patterson | 2012-02-22 | 1 | -0/+31 |
| | | |||||
* | | Merge pull request #5119 from kennyj/fix_5114 | Aaron Patterson | 2012-02-22 | 1 | -0/+26 |
|\ \ | | | | | | | Testcase for GH #5114. | ||||
| * | | Testcase for GH #5114. | kennyj | 2012-02-22 | 1 | -0/+26 |
| |/ | |||||
* | | Merge pull request #5130 from dlee/revised_patch_verb | Xavier Noria | 2012-02-22 | 9 | -17/+129 |
|\ \ | | | | | | | Add config.default_method_for_update to support PATCH | ||||
| * | | Add config.default_method_for_update to support PATCH | David Lee | 2012-02-22 | 9 | -17/+129 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PATCH is the correct HTML verb to map to the #update action. The semantics for PATCH allows for partial updates, whereas PUT requires a complete replacement. Changes: * adds config.default_method_for_update you can set to :patch * optionally use PATCH instead of PUT in resource routes and forms * adds the #patch verb to routes to detect PATCH requests * adds #patch? to Request * changes documentation and comments to indicate support for PATCH This change maintains complete backwards compatibility by keeping :put as the default for config.default_method_for_update. | ||||
* | | | format lookup for partials is derived from the format in which the template ↵ | Santiago Pastorino | 2012-02-22 | 3 | -4/+9 |
|/ / | | | | | | | | | | | is being rendered Closes #5025 part 2 | ||||
* | | Don't wrap the raise with ensure | Santiago Pastorino | 2012-02-21 | 1 | -1/+1 |
| | | |||||
* | | Restore lookup formats to the previous value after searching for the failing ↵ | Santiago Pastorino | 2012-02-21 | 1 | -1/+2 |
|/ | | | | view | ||||
* | Merge pull request #5102 from nashby/form-option-refactor | José Valim | 2012-02-20 | 1 | -16/+16 |
|\ | | | | | form option refactor | ||||
| * | refactor options_for_select | Vasiliy Ermolovich | 2012-02-20 | 1 | -16/+16 |
| | | |||||
* | | Fix a failing test | Santiago Pastorino | 2012-02-20 | 1 | -0/+2 |
| | | |||||
* | | Use the right format when a partial is missing. | Santiago Pastorino | 2012-02-20 | 2 | -0/+8 |
| | | | | | | | | Closes #5025 | ||||
* | | Merge pull request #5101 from ckdake/ckdake_actionview_handler_reset | José Valim | 2012-02-20 | 1 | -0/+6 |
|/ | | | | | | | Reset memoized hash keys when new ActionView::Template handler is registered Conflicts: actionpack/lib/action_view/template/handlers.rb | ||||
* | Merge pull request #5082 from ↵ | Aaron Patterson | 2012-02-20 | 1 | -0/+5 |
|\ | | | | | | | | | willbryant/assigns_should_not_stringify_values_master assigns(:foo) should not convert @foo's keys to strings if it happens to be a hash | ||||
| * | assigns(:foo) should not convert @foo's keys to strings if it happens to be ↵ | Will Bryant | 2012-02-18 | 1 | -0/+5 |
| | | | | | | | | a hash | ||||
* | | Merge pull request #5083 from nashby/grouped-select-options | José Valim | 2012-02-20 | 1 | -0/+18 |
|\ \ | | | | | | | add selected and disabled options to grouped select | ||||
| * | | add selected and disabled option to grouped select | Vasiliy Ermolovich | 2012-02-18 | 1 | -0/+18 |
| |/ | |||||
* | | Remove fixture files with Windows incompatible filenames | Andrew White | 2012-02-20 | 13 | -38/+88 |
| | | | | | | | | | | | | Windows doesn't allow `\ / : * ? " < > |` in filenames so create the fixture files at runtime and ignore the incompatible ones when running on Windows. | ||||
* | | Integration tests support the OPTIONS http method | Jeremy Kemper | 2012-02-19 | 1 | -1/+17 |
|/ |