Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | 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 | |
|/ | ||||||
* | Merge pull request #3479 from arvida/ensure-date-header-on-expires-in | José Valim | 2012-02-18 | 1 | -0/+7 | |
|\ | | | | | Ensure Date header on expires_in | |||||
| * | Added test for setting of HTTP Date header when calling #expires_in | arvida | 2011-10-31 | 1 | -0/+7 | |
| | | ||||||
* | | Fix ActionDispatch::Static to serve files with unencoded PCHAR | Andrew White | 2012-02-17 | 13 | -3/+38 | |
| | | | | | | | | | | | | | | | | | | | | | | 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 | -0/+20 | |
| | | ||||||
* | | escape static file path to prevent double unescaping | Sergey Nartimov | 2012-02-16 | 2 | -0/+5 | |
| | | ||||||
* | | ActionDispatch: add missing test for callbacks | Bogdan Gusiev | 2012-02-16 | 1 | -2/+9 | |
| | | ||||||
* | | fixing AP tests | Aaron Patterson | 2012-02-15 | 1 | -1/+1 | |
| | | ||||||
* | | adding tests to document behavior for #4817 | Aaron Patterson | 2012-02-14 | 1 | -0/+26 | |
| | | ||||||
* | | Rack body respond to each and not to join | Santiago Pastorino | 2012-02-14 | 1 | -0/+12 | |
| | | | | | | | | | | | | | | This fixes undef `to_str' for Rack::Chunked::Body when using caches_action + streaming on an action Closes #5027 | |||||
* | | Merge pull request #5032 from carlosantoniodasilva/collection-helpers-object | José Valim | 2012-02-14 | 1 | -0/+26 | |
|\ \ | | | | | | | 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 | 1 | -0/+26 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -0/+33 | |
|\ \ \ | |/ / |/| | | Exclude rack.request.form_vars from request.filtered_env | |||||
| * | | Exclude rack.request.form_vars from request.filtered_env | Chad Jolly | 2012-01-18 | 1 | -0/+33 | |
| | | | ||||||
* | | | remove unwanted require for string encoding | Vishnu Atrai | 2012-02-13 | 1 | -1/+0 | |
| | | | ||||||
* | | | Merge pull request #5016 from exviva/form_helper_date_fields | José Valim | 2012-02-12 | 2 | -1/+32 | |
|\ \ \ | | | | | | | | | Add HTML5 input[type="date"] helper | |||||
| * | | | Add HTML5 input[type="date"] helper | Olek Janiszewski | 2012-02-12 | 2 | -1/+32 | |
| | | | | ||||||
* | | | | Removing old Controller test | Thiago Pradi | 2012-02-12 | 3 | -39/+0 | |
|/ / / | ||||||
* | | | Cleaning Route generation tests | Thiago Pradi | 2012-02-12 | 2 | -58/+2 | |
| | | | ||||||
* | | | say goodbye to #with_test_routes :axe: | Xavier Noria | 2012-02-10 | 1 | -1166/+947 | |
| | | | ||||||
* | | | fixes a regression introduced by 532cd4, and a bogus test in AP the ↵ | Xavier Noria | 2012-02-10 | 1 | -6/+6 | |
| | | | | | | | | | | | | regression uncovered | |||||
* | | | Fix GH #4720. Routing problem with nested namespace and already camelized ↵ | kennyj | 2012-02-10 | 1 | -0/+26 | |
| | | | | | | | | | | | | controller option. | |||||
* | | | Merge pull request #4957 from ganeshkumar/order_hash_change | Xavier Noria | 2012-02-09 | 1 | -3/+2 | |
|\ \ \ | | | | | | | | | replacing the orderhash with hash for ruby-1.9 | |||||
| * | | | replacing the orderhash with hash for ruby-1.9 | ganesh | 2012-02-09 | 1 | -3/+2 | |
| | | | | ||||||
* | | | | removed unnecessary code | ganesh | 2012-02-09 | 1 | -1/+0 | |
|/ / / | ||||||
* | | | Fix failing request test | Carlos Antonio da Silva | 2012-02-07 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Latest changes in remote ip handling conflicted with each other in tests. Related: dd09811fa6214a130fdc2de1d4c00b4337cb15f9 6a720226aad2adffcbd2422d40db772719579e2f | |||||
* | | | Added unit test to cover changes to RouteSet.url_for | Ryan McGeary | 2012-02-07 | 1 | -0/+16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ActionDispatch::Routing::RouteSet.url_for now handles passing params through to ActionDispatch::Http::Url.url_for Conflicts: actionpack/test/controller/base_test.rb | |||||
* | | | Fixed force_ssl redirects to include original query params | Ryan McGeary | 2012-02-07 | 1 | -0/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `ActionController.force_ssl` redirects http URLs to their https equivalent; however, when a URL contains a query string, the resulting redirect lacked the original query string. Conflicts: actionpack/lib/action_controller/metal/force_ssl.rb | |||||
* | | | Merge pull request #2490 from gsterndale/x_forwarded_for_order | José Valim | 2012-02-07 | 1 | -4/+4 | |
|\ \ \ | | | | | | | | | The first IP address in the X-Forwarded-For header is the originating IP | |||||
| * | | | The first IP address in the X-Forwarded-For header is the originating IP | Greg Sterndale | 2012-02-07 | 1 | -4/+4 | |
| | | | |