Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
* | Document the :host option for force_ssl | Andrew White | 2012-02-23 | 1 | -0/+1 |
| | |||||
* | Update documentation for force_ssl - closes #5023. | Andrew White | 2012-02-23 | 1 | -1/+14 |
| | |||||
* | SSL should not be disabled by default in any environment. | Pat Allan | 2012-02-23 | 1 | -1/+1 |
| | |||||
* | Avoid inspecting the whole route set, closes #1525 | José Valim | 2012-02-23 | 1 | -0/+6 |
| | |||||
* | Remove skip_filter block param | Alexey Vakhov | 2012-02-23 | 1 | -7/+7 |
| | |||||
* | Merge pull request #5084 from johndouthat/patch-1 | Aaron Patterson | 2012-02-22 | 1 | -2/+1 |
|\ | | | | | Remove reference to rails_legacy_mapper, which isn't compatible with 3.2... | ||||
| * | Remove reference to rails_legacy_mapper, which isn't compatible with 3.2 #5022 | johndouthat | 2012-02-18 | 1 | -2/+1 |
| | | |||||
* | | Only set ActionView configuration inside the on_load block | Rafael Mendonça França | 2012-02-22 | 1 | -1/+1 |
| | | |||||
* | | Fix routes inspection order | Rafael Mendonça França | 2012-02-22 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #5130 from dlee/revised_patch_verb | Xavier Noria | 2012-02-22 | 12 | -82/+130 |
|\ \ | | | | | | | Add config.default_method_for_update to support PATCH | ||||
| * | | Add config.default_method_for_update to support PATCH | David Lee | 2012-02-22 | 12 | -82/+130 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | AS::Callbacks: deprecate rescuable option | Bogdan Gusiev | 2012-02-22 | 1 | -3/+9 |
| | | | |||||
* | | | format lookup for partials is derived from the format in which the template ↵ | Santiago Pastorino | 2012-02-22 | 7 | -30/+14 |
|/ / | | | | | | | | | | | is being rendered Closes #5025 part 2 | ||||
* | | fix bad docs from f373f296 [ci skip] | Vijay Dev | 2012-02-21 | 1 | -3/+3 |
| | | |||||
* | | Don't wrap the raise with ensure | Santiago Pastorino | 2012-02-21 | 1 | -9/+11 |
| | | |||||
* | | Refactored two methods to use delete with a block | Ruben Fonseca | 2012-02-21 | 2 | -2/+2 |
| | | |||||
* | | Restore lookup formats to the previous value after searching for the failing ↵ | Santiago Pastorino | 2012-02-21 | 1 | -1/+3 |
| | | | | | | | | view | ||||
* | | use Hash#delete on styelsheet_link_tag | Ruben Fonseca | 2012-02-21 | 1 | -3/+3 |
| | | |||||
* | | use Hash#delete with a default block | Aaron Patterson | 2012-02-20 | 1 | -3/+3 |
| | | |||||
* | | Merge pull request #5102 from nashby/form-option-refactor | José Valim | 2012-02-20 | 1 | -12/+13 |
|\ \ | | | | | | | form option refactor | ||||
| * | | refactor options_for_select | Vasiliy Ermolovich | 2012-02-20 | 1 | -7/+8 |
| | | | |||||
| * | | refactor grouped_options_for_select | Vasiliy Ermolovich | 2012-02-20 | 1 | -5/+5 |
| | | | |||||
* | | | Use the right format when a partial is missing. | Santiago Pastorino | 2012-02-20 | 1 | -0/+1 |
| | | | | | | | | | | | | Closes #5025 | ||||
* | | | Merge pull request #5101 from ckdake/ckdake_actionview_handler_reset | José Valim | 2012-02-20 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | Reset memoized hash keys when new ActionView::Template handler is registered Conflicts: actionpack/lib/action_view/template/handlers.rb | ||||
* | | | search private / protected methods in trunk ruby | Aaron Patterson | 2012-02-20 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #5082 from ↵ | Aaron Patterson | 2012-02-20 | 1 | -1/+2 |
|\ \ | | | | | | | | | | | | | 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 | -1/+2 |
| |/ | | | | | | | a hash | ||||
* | | Merge pull request #5083 from nashby/grouped-select-options | José Valim | 2012-02-20 | 1 | -1/+6 |
|\ \ | | | | | | | add selected and disabled options to grouped select | ||||
| * | | add selected and disabled option to grouped select | Vasiliy Ermolovich | 2012-02-18 | 1 | -1/+6 |
| |/ | |||||
* | | Integration tests support the OPTIONS http method | Jeremy Kemper | 2012-02-19 | 1 | -1/+7 |
| | | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-02-18 | 2 | -7/+7 |
|\ \ | |/ |/| | |||||
| * | Fix AbstractController::Base#hidden_actions comment | Alexey Vakhov | 2012-02-18 | 1 | -2/+2 |
| | | |||||
| * | Update f.button docs to reflect real label implementation | Carlos Antonio da Silva | 2012-02-14 | 1 | -5/+5 |
| | | |||||
* | | Merge pull request #3479 from arvida/ensure-date-header-on-expires-in | José Valim | 2012-02-18 | 2 | -0/+17 |
|\ \ | | | | | | | Ensure Date header on expires_in | ||||
| * | | Ensuring a HTTP Date header when setting Cache-Control's max-age with ↵ | arvida | 2011-10-31 | 1 | -0/+3 |
| | | | | | | | | | | | | #expires_in | ||||
| * | | Added accessor methods for Date header | arvida | 2011-10-31 | 1 | -0/+14 |
| | | | |||||
* | | | Simplify regexp | Andrew White | 2012-02-17 | 1 | -1/+1 |
| | | | |||||
* | | | Fix ActionDispatch::Static to serve files with unencoded PCHAR | Andrew White | 2012-02-17 | 1 | -1/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RFC 3986[1] allows sub-delim characters in path segments unencoded, however Rack::File requires them to be encoded so we use URI's unescape method to leave them alone and then escape them again. Also since the path gets passed to Dir[] we need to escape any glob characters in the path. [1]: http://www.ietf.org/rfc/rfc3986.txt | ||||
* | | | let expires_in accept a must_revalidate flag | Xavier Noria | 2012-02-17 | 1 | -2/+6 |
| | | | |||||
* | | | escape static file path to prevent double unescaping | Sergey Nartimov | 2012-02-16 | 1 | -1/+1 |
| | | | |||||
* | | | Rack body respond to each and not to join | Santiago Pastorino | 2012-02-14 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | This fixes undef `to_str' for Rack::Chunked::Body when using caches_action + streaming on an action Closes #5027 | ||||
* | | | Remove not used button translation from av locale | Carlos Antonio da Silva | 2012-02-14 | 1 | -8/+1 |
| | | | |||||
* | | | Merge pull request #5032 from carlosantoniodasilva/collection-helpers-object | José Valim | 2012-02-14 | 3 | -9/+10 |
|\ \ \ | | | | | | | | | Allow collection helpers with block to access current object in the collection | ||||
| * | | | Allow collection helpers with block to access current object in the collection | Carlos Antonio da Silva | 2012-02-13 | 3 | -9/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This gives a lot more flexibility to the user, for instance to generate a collection of check boxes and labels, allowing to add custom classes or data-* attributes to the label/check_box using another object attribute. This basically mimics options_for_select functionality that accepts a third option for each item to generate html attributes for each option. | ||||
* | | | | Merge pull request #3305 from cjolly/request_filtered_env | Jeremy Kemper | 2012-02-13 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | Exclude rack.request.form_vars from request.filtered_env | ||||
| * | | | Exclude rack.request.form_vars from request.filtered_env | Chad Jolly | 2012-01-18 | 1 | -1/+1 |
| | | | | |||||
* | | | | Use Hash#fetch instead of testing for #key? | Carlos Antonio da Silva | 2012-02-13 | 2 | -3/+3 |
| | | | | |||||
* | | | | Refactor sprockets compressors module | Carlos Antonio da Silva | 2012-02-13 | 1 | -20/+22 |
| | | | | |||||
* | | | | remove unwanted require for string encoding | Vishnu Atrai | 2012-02-13 | 1 | -1/+0 |
| | | | |