Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | 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 | |
| | | | | ||||||
* | | | | Merge pull request #2632 from gsterndale/replace_trusted_proxies | José Valim | 2012-02-07 | 1 | -2/+13 | |
|\ \ \ \ | | | | | | | | | | | Trusted proxies are configurable | |||||
| * | | | | Trusted proxies is replaced with a Regexp or appended to with a String | Greg Sterndale | 2012-02-07 | 1 | -2/+13 | |
| |/ / / | ||||||
* | | | | Merge pull request #4918 from scottwb/fix-single-accept-with-q | José Valim | 2012-02-07 | 1 | -0/+6 | |
|\ \ \ \ | |/ / / |/| | | | Fix MIME::Type.parse handling of single media with a q value | |||||
| * | | | Failing test case that shows issue #736 should still be open. | Scott W. Bradley | 2012-02-06 | 1 | -0/+6 | |
| | | | | ||||||
* | | | | Always use content_tag for audio/video tag | Rafael Mendonça França | 2012-02-07 | 1 | -15/+15 | |
|/ / / | | | | | | | | | | Closes #4919 | |||||
* | | | Fix url_for method's behavior when it is called with :controller option ↵ | kennyj | 2012-02-07 | 1 | -0/+33 | |
| | | | | | | | | | | | | | | | | | | which starts with "/" from multiple nested controller. Closes #3864 | |||||
* | | | Revert "Deprecated multi args to http route methods" | Jeremy Kemper | 2012-02-05 | 1 | -2/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Too painful to lose the compact shorthand form! This reverts commit e848c52535fa0f9488cdbdb3f1cedc7c7c02d643. Conflicts: actionpack/lib/action_dispatch/routing/mapper.rb | |||||
* | | | Highlight defaults to HTML5 `mark` element | Brian Cardarella | 2012-02-05 | 1 | -12/+12 | |
| | | | ||||||
* | | | Add testcase for non english filename. Related to #2982. | kennyj | 2012-02-05 | 2 | -1/+7 | |
| | | | ||||||
* | | | Add *_url helpers to get the full assets URL | Prem Sichanugrist | 2012-02-04 | 1 | -2/+129 | |
| | | | | | | | | | | | | | | | | | | | | | Adds `image_url`, `javascript_url`, `stylesheet_url`, `audio_url`, `video_url`, and `font_url` to assets tag helper. These URL helpers will return the full path to your assets. This is useful when you are going to reference this asset from external host. | |||||
* | | | Merge pull request #4869 from sikachu/master-responder-fix | José Valim | 2012-02-04 | 2 | -0/+35 | |
|\ \ \ | | | | | | | | | Fix override API response bug in respond_with | |||||
| * | | | Fix override API response bug in respond_with | Prem Sichanugrist | 2012-02-03 | 2 | -0/+35 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default responder was only using the given respond block when user requested for HTML format, or JSON/XML format with valid resource. This fix the responder so that it will use the given block regardless of the validity of the resource. Note that in this case you'll have to check for object's validity by yourself in the controller. Fixes #4796 |