Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
* | | Fix GH #4873. Allow swapping middleware of same class | kennyj | 2012-02-04 | 1 | -0/+6 |
|/ | |||||
* | Remove default class to collection_check_boxes and | Rafael Mendonça França | 2012-02-02 | 1 | -16/+16 |
| | | | | | | 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 | 1 | -0/+44 |
| | | | | [Carlos Antonio da Silva + Rafael Mendonça França] | ||||
* | Add changelog, docs and guides entries | Carlos Antonio da Silva | 2012-02-02 | 1 | -2/+20 |
| | | | | [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 | 1 | -10/+42 |
| | | | | | | And options_from_collection_for_select as well. [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 | 1 | -4/+4 |
| | | | | | | | | 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] | ||||
* | Remove collection_wrapper* and item_wrapper* options | Carlos Antonio da Silva | 2012-02-02 | 1 | -173/+0 |
| | | | | [Carlos Antonio da Silva + Rafael Mendonça França] | ||||
* | Use @output_buffer variable instead of concat in tests | Carlos Antonio da Silva | 2012-02-02 | 1 | -10/+9 |
| | | | | [Carlos Antonio da Silva + Rafael Mendonça França] | ||||
* | Implement skipped test | Rafael Mendonça França | 2012-02-02 | 1 | -3/+5 |
| | | | | [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 | -9/+20 |
| | | | | [Carlos Antonio da Silva + Rafael Mendonça França] | ||||
* | Change Tag class to Category since there is another Tag class | Rafael Mendonça França | 2012-02-02 | 1 | -33/+33 |
| | | | | [Carlos Antonio da Silva + Rafael Mendonça França] | ||||
* | Add collection_check_boxes helper | Carlos Antonio da Silva | 2012-02-02 | 1 | -1/+227 |
| | | | | [Carlos Antonio da Silva + Rafael Mendonça França] | ||||
* | Create collection_radio_buttons helper | Carlos Antonio da Silva | 2012-02-02 | 1 | -0/+174 |
| | | | | [Carlos Antonio da Silva + Rafael Mendonça França] | ||||
* | Replicate :form html5 attribute to hidden field for check_box | Carlos Antonio da Silva | 2012-02-02 | 1 | -3/+10 |
| | | | | | When the new html5 attribute :form is given to the check_box helper, it should be replicated to the hidden field as well. Closes #4848 | ||||
* | Merge pull request #4804 from rafaelfranca/check_box-fix | José Valim | 2012-02-01 | 1 | -0/+4 |
|\ | | | | | check_box with nil as unchecked value should be HTML safe | ||||
| * | check_box with nil as unchecked value should be HTML safe | Rafael Mendonça França | 2012-01-31 | 1 | -0/+4 |
| | | | | | | | | [Carlos Antonio da Silva + Rafael Mendonça França] | ||||
* | | Move escape_once logic to ERB::Util, where it belongs to | Carlos Antonio da Silva | 2012-02-01 | 1 | -0/+14 |
| | | | | | | | | | | | | All the logic is based on the HTML_ESCAPE constant available in ERB::Util, so it seems more logic to have the entire method there and just delegate the helper to use it. | ||||
* | | Merge pull request #4672 from carlosantoniodasilva/av-url-helper | José Valim | 2012-02-01 | 1 | -8/+8 |
|\ \ | | | | | | | Improvements on some url helper methods and tests | ||||
| * | | Change OrderedHash with array options to simple hash usage | Carlos Antonio da Silva | 2012-01-25 | 1 | -8/+8 |
| | | | |||||
* | | | Remove slash from favicon_link_tag method attribute | Lucas Caton | 2012-01-31 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Replaced all 'for' loops with Enumerable#each | Nathan Broadbent | 2012-01-30 | 1 | -1/+1 |
| | | |||||
* | | tiny refactoring | Vasiliy Ermolovich | 2012-01-29 | 1 | -3/+3 |
| | | | | | | | | | | use :default option with translate method instead of condition simplify separator method | ||||
* | | Remove not used env[] call in routing_test. | Carlos Antonio da Silva | 2012-01-27 | 1 | -1/+0 |
| | | | | | | The commit 4c321c6d42b6e35f9ead12eb1dccdead03c5abf4 removes the path_params variable assignment, actually the entire line is not used at all. | ||||
* | | Fix warning. assigned but unused variable - path_params | kennyj | 2012-01-28 | 1 | -1/+1 |
| | | |||||
* | | Do not generate label for attribute when giving nil | Carlos Antonio da Silva | 2012-01-26 | 1 | -0/+4 |
| | | |||||
* | | reuse common video/audio tags code and do not modify options | Sergey Nartimov | 2012-01-26 | 1 | -0/+8 |
| | | |||||
* | | do not modify options in image_tag | Sergey Nartimov | 2012-01-26 | 1 | -0/+6 |
| | | |||||
* | | allow to pass multiple sources to audio/video tags without using array | Sergey Nartimov | 2012-01-25 | 1 | -0/+2 |
| | | |||||
* | | Merge pull request #4529 from ask4prasath/refactor | Vijay Dev | 2012-01-25 | 1 | -8/+10 |
|\ \ | |/ |/| | Refactored class methods on address render test | ||||
| * | Refactored class methods on address render test | prasath | 2012-01-19 | 1 | -8/+10 |
| | | |||||
* | | Merge pull request #4658 from pwim/unicode-paths | Aaron Patterson | 2012-01-25 | 1 | -0/+20 |
| | | | | | | | | Test for unicode path support | ||||
* | | Do not mutate given options hash in number helpers | Carlos Antonio da Silva | 2012-01-25 | 1 | -0/+25 |
| | | |||||
* | | Make audio_tag able to receive multiple sources | Janko Marohnić | 2012-01-25 | 1 | -0/+2 |
| | | |||||
* | | Make path_to_video in video_tag apply to each source | Janko Marohnić | 2012-01-25 | 1 | -2/+2 |
| | |