Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | 2 | -28/+29 |
|\ | | | | | form option refactor | ||||
| * | refactor options_for_select | Vasiliy Ermolovich | 2012-02-20 | 2 | -23/+24 |
| | | |||||
| * | refactor grouped_options_for_select | Vasiliy Ermolovich | 2012-02-20 | 1 | -5/+5 |
| | | |||||
* | | 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 | 3 | -0/+9 |
| | | | | | | | | Closes #5025 | ||||
* | | Merge pull request #5101 from ckdake/ckdake_actionview_handler_reset | José Valim | 2012-02-20 | 2 | -0/+7 |
| | | | | | | | | | | | | | | 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 | 2 | -1/+7 |
|\ | | | | | | | | | 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 | 2 | -1/+7 |
| | | | | | | | | a hash | ||||
* | | Merge pull request #5083 from nashby/grouped-select-options | José Valim | 2012-02-20 | 2 | -1/+24 |
|\ \ | | | | | | | add selected and disabled options to grouped select | ||||
| * | | add selected and disabled option to grouped select | Vasiliy Ermolovich | 2012-02-18 | 2 | -1/+24 |
| |/ | |||||
* | | 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 | 3 | -2/+26 |
| | | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-02-18 | 3 | -8/+8 |
|\ \ | |/ |/| | |||||
| * | Fix actionpack readme weblog example | Alexey Vakhov | 2012-02-18 | 1 | -1/+1 |
| | | |||||
| * | 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 | 3 | -0/+24 |
|\ \ | | | | | | | 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 |
| | | | |||||
| * | | Added test for setting of HTTP Date header when calling #expires_in | arvida | 2011-10-31 | 1 | -0/+7 |
| | | | |||||
* | | | Simplify regexp | Andrew White | 2012-02-17 | 1 | -1/+1 |
| | | | |||||
* | | | Fix ActionDispatch::Static to serve files with unencoded PCHAR | Andrew White | 2012-02-17 | 14 | -4/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 3 | -2/+29 |
| | | | |||||
* | | | escape static file path to prevent double unescaping | Sergey Nartimov | 2012-02-16 | 3 | -1/+6 |
| | | | |||||
* | | | 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 | 2 | -2/+16 |
| | | | | | | | | | | | | | | | | | | | | | 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 | 4 | -9/+36 |
|\ \ \ | | | | | | | | | 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 | 4 | -9/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -1/+34 |
|\ \ \ \ | |/ / / |/| | | | Exclude rack.request.form_vars from request.filtered_env | ||||
| * | | | Exclude rack.request.form_vars from request.filtered_env | Chad Jolly | 2012-01-18 | 2 | -1/+34 |
| | | | | |||||
* | | | | 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 | 2 | -2/+0 |
| | | | | |||||
* | | | | Merge pull request #5016 from exviva/form_helper_date_fields | José Valim | 2012-02-12 | 8 | -2/+77 |
|\ \ \ \ | | | | | | | | | | | Add HTML5 input[type="date"] helper | ||||
| * | | | | Add HTML5 input[type="date"] helper | Olek Janiszewski | 2012-02-12 | 8 | -2/+77 |
| | | | | | |||||
* | | | | | 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 | 2 | -0/+31 |
| |_|/ |/| | | | | | | | | controller option. | ||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-02-09 | 2 | -4/+4 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/relation/query_methods.rb | ||||
| * | | | Stop referring to Atom as "ATOM" | Tom Stuart | 2012-02-05 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | $ curl -s http://www.ietf.org/rfc/rfc4287 | grep -io ATOM | sort | uniq -c 582 atom 175 Atom | ||||
| * | | | Remove assert_select_feed from assert_select_encoded documentation | Tom Stuart | 2012-02-05 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | This documentation came from the assert_select plugin, but the assert_select_feed method was omitted when the plugin was merged into Rails in 3142502964f94d6144312ae2c368b4c4589fa25a. | ||||
* | | | | 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 |
| | | | | |