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 | 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 |
| | | | | |||||
* | | | | Add HTML5 input[type="date"] helper | Olek Janiszewski | 2012-02-12 | 5 | -1/+43 |
| | | | | |||||
* | | | | Fix GH #4720. Routing problem with nested namespace and already camelized ↵ | kennyj | 2012-02-10 | 1 | -0/+5 |
| |_|/ |/| | | | | | | | | 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. | ||||
* | | | | Fix match docs | Rafael Mendonça França | 2012-02-07 | 1 | -1/+1 |
| | | | | |||||
* | | | | Trim down Active Model API by removing valid? and errors.full_messages | José Valim | 2012-02-07 | 1 | -1/+1 |
| | | | | |||||
* | | | | Fixed force_ssl redirects to include original query params | Ryan McGeary | 2012-02-07 | 2 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `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 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | 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 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #2632 from gsterndale/replace_trusted_proxies | José Valim | 2012-02-07 | 1 | -4/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | Trusted proxies are configurable | ||||
| * | | | | | Trusted proxies is replaced with a Regexp or appended to with a String | Greg Sterndale | 2012-02-07 | 1 | -4/+6 |
| |/ / / / | |||||
* | | | | | Merge pull request #4918 from scottwb/fix-single-accept-with-q | José Valim | 2012-02-07 | 1 | -1/+3 |
|\ \ \ \ \ | |/ / / / |/| | | | | Fix MIME::Type.parse handling of single media with a q value | ||||
| * | | | | Correctly handle single media with q value. Fixes #736. | Scott W. Bradley | 2012-02-06 | 1 | -1/+3 |
| | | | | | |||||
* | | | | | Always use content_tag for audio/video tag | Rafael Mendonça França | 2012-02-07 | 1 | -1/+1 |
|/ / / / | | | | | | | | | | | | | Closes #4919 | ||||
* | | | | Fix url_for method's behavior when it is called with :controller option ↵ | kennyj | 2012-02-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | which starts with "/" from multiple nested controller. Closes #3864 | ||||
* | | | | Note the ways #match may be called | Jeremy Kemper | 2012-02-05 | 1 | -0/+3 |
| | | | | |||||
* | | | | Revert "Deprecated multi args to http route methods" | Jeremy Kemper | 2012-02-05 | 1 | -11/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -4/+4 |
| | | | |