Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | |||||
* | | | Add *_url helpers to get the full assets URL | Prem Sichanugrist | 2012-02-04 | 3 | -0/+46 |
| | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | Clean up a bit default_response handling and cache format negotiation. | José Valim | 2012-02-04 | 2 | -19/+17 |
| | | | |||||
* | | | Merge pull request #4869 from sikachu/master-responder-fix | José Valim | 2012-02-04 | 1 | -8/+23 |
|\ \ \ | | | | | | | | | Fix override API response bug in respond_with | ||||
| * | | | Fix override API response bug in respond_with | Prem Sichanugrist | 2012-02-03 | 1 | -8/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | | | Fix GH #4873. Allow swapping middleware of same class | kennyj | 2012-02-04 | 1 | -2/+3 |
| | | | | |||||
* | | | | Merge pull request #4866 from bogdan/terminate_after_callbacks | José Valim | 2012-02-04 | 1 | -3/+1 |
|\ \ \ \ | |/ / / |/| | | | AS::Callbacks#define_callbacks: add :terminate_after_callbacks option | ||||
| * | | | AS::Callbacks: :skip_after_callbacks_if_terminated option | Bogdan Gusiev | 2012-02-03 | 1 | -3/+1 |
| | | | | |||||
* | | | | AC::Callbacks: remove usage of :per_key option from filters | Bogdan Gusiev | 2012-02-03 | 1 | -6/+4 |
|/ / / | |||||
* | | | Remove default class to collection_check_boxes and | Rafael Mendonça França | 2012-02-02 | 3 | -10/+10 |
| | | | | | | | | | | | | | | | | | | collection_radio_buttons [Carlos Antonio da Silva + Rafael Mendonça França] | ||||
* | | | Allow collection radio_buttons/check_boxes to access current text/value | Carlos Antonio da Silva | 2012-02-02 | 2 | -0/+16 |
| | | | | | | | | | | | | [Carlos Antonio da Silva + Rafael Mendonça França] | ||||
* | | | Add changelog, docs and guides entries | Carlos Antonio da Silva | 2012-02-02 | 1 | -17/+63 |
| | | | | | | | | | | | | [Carlos Antonio da Silva + Rafael Mendonça França] | ||||
* | | | Allow proc for value/text method in collection_select | Carlos Antonio da Silva | 2012-02-02 | 2 | -6/+6 |
| | | | | | | | | | | | | | | | | | | And options_from_collection_for_select as well. [Carlos Antonio da Silva + Rafael Mendonça França] | ||||
* | | | Move collection radio buttons / check boxes back to FormOptionsHelper | Carlos Antonio da Silva | 2012-02-02 | 4 | -92/+81 |
| | | | | | | | | | | | | [Carlos Antonio da Silva + Rafael Mendonça França] | ||||
* | | | Extract common collection helpers to a module to avoid too much inheritance | Carlos Antonio da Silva | 2012-02-02 | 3 | -69/+93 |
| | | | | | | | | | | | | [Carlos Antonio da Silva + Rafael Mendonça França] | ||||
* | | | Create a Builder factory class to use with collection helpers + block | Carlos Antonio da Silva | 2012-02-02 | 2 | -17/+41 |
| | | | | | | | | | | | | | | | | | | | | | | | | This will make it easy for the user to handle how check box/radio and labels should be generated, abstracting any text/value/default html options required to make it work. [Carlos Antonio da Silva + Rafael Mendonça França] | ||||
* | | | Refactor collection helpers to extract radio/checkbox/label calls | Carlos Antonio da Silva | 2012-02-02 | 2 | -8/+18 |
| | | | | | | | | | | | | [Carlos Antonio da Silva + Rafael Mendonça França] | ||||
* | | | Remove collection_wrapper* and item_wrapper* options | Carlos Antonio da Silva | 2012-02-02 | 3 | -45/+15 |
| | | | | | | | | | | | | [Carlos Antonio da Silva + Rafael Mendonça França] | ||||
* | | | Refactor value sanitization logic | Carlos Antonio da Silva | 2012-02-02 | 2 | -8/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Extract value sanitization from default name and id method and new collection helpers; * No need to sanitize value in default name and id always; * Improve value_before_type_cast to avoid concating the same method name string twice. [Carlos Antonio da Silva + Rafael Mendonça França] | ||||
* | | | Cleanup options helper methods a bit | Carlos Antonio da Silva | 2012-02-02 | 1 | -12/+12 |
| | | | | | | | | | | | | [Carlos Antonio da Silva + Rafael Mendonça França] | ||||
* | | | Refactor option groups to use content_tag | Carlos Antonio da Silva | 2012-02-02 | 1 | -4/+4 |
| | | | | | | | | | | | | [Carlos Antonio da Silva + Rafael Mendonça França] | ||||
* | | | Add basic documentation to collection_check_boxes and | Rafael Mendonça França | 2012-02-02 | 1 | -0/+71 |
| | | | | | | | | | | | | | | | | | | collection_radio_buttons [Carlos Antonio da Silva + Rafael Mendonça França] | ||||
* | | | Add collection_radio_buttons and collection_check_boxes to FormBuilder | Rafael Mendonça França | 2012-02-02 | 1 | -0/+10 |
| | | | | | | | | | | | | [Carlos Antonio da Silva + Rafael Mendonça França] |