aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-02-092-4/+4
|\ | | | | | | | | Conflicts: activerecord/lib/active_record/relation/query_methods.rb
| * Stop referring to Atom as "ATOM"Tom Stuart2012-02-052-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 documentationTom Stuart2012-02-051-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_changeXavier Noria2012-02-091-3/+2
|\ \ | | | | | | replacing the orderhash with hash for ruby-1.9
| * | replacing the orderhash with hash for ruby-1.9ganesh2012-02-091-3/+2
| | |
* | | removed unnecessary codeganesh2012-02-091-1/+0
|/ /
* | Fix match docsRafael Mendonça França2012-02-071-1/+1
| |
* | Merge pull request #4932 from carlosantoniodasilva/fix-request-testJosé Valim2012-02-071-1/+1
|\ \ | | | | | | Fix failing request test
| * | Fix failing request testCarlos Antonio da Silva2012-02-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Latest changes in remote ip handling conflicted with each other in tests. Related: dd09811fa6214a130fdc2de1d4c00b4337cb15f9 6a720226aad2adffcbd2422d40db772719579e2f
* | | Trim down Active Model API by removing valid? and errors.full_messagesJosé Valim2012-02-071-1/+1
|/ /
* | Added unit test to cover changes to RouteSet.url_forRyan McGeary2012-02-071-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 paramsRyan McGeary2012-02-073-0/+8
| | | | | | | | | | | | | | | | | | | | `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_orderJosé Valim2012-02-072-5/+5
|\ \ | | | | | | 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 IPGreg Sterndale2012-02-072-5/+5
| | |
* | | Merge pull request #2632 from gsterndale/replace_trusted_proxiesJosé Valim2012-02-072-6/+19
|\ \ \ | | | | | | | | Trusted proxies are configurable
| * | | Trusted proxies is replaced with a Regexp or appended to with a StringGreg Sterndale2012-02-072-6/+19
| |/ /
* | | Merge pull request #4918 from scottwb/fix-single-accept-with-qJosé Valim2012-02-072-1/+9
|\ \ \ | |/ / |/| | Fix MIME::Type.parse handling of single media with a q value
| * | Correctly handle single media with q value. Fixes #736.Scott W. Bradley2012-02-061-1/+3
| | |
| * | Failing test case that shows issue #736 should still be open.Scott W. Bradley2012-02-061-0/+6
| | |
* | | Always use content_tag for audio/video tagRafael Mendonça França2012-02-072-16/+16
|/ / | | | | | | Closes #4919
* | Fix url_for method's behavior when it is called with :controller option ↵kennyj2012-02-072-1/+34
| | | | | | | | | | | | which starts with "/" from multiple nested controller. Closes #3864
* | Note the ways #match may be calledJeremy Kemper2012-02-051-0/+3
| |
* | Revert "Deprecated multi args to http route methods"Jeremy Kemper2012-02-052-13/+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` elementBrian Cardarella2012-02-053-16/+19
| |
* | Add testcase for non english filename. Related to #2982.kennyj2012-02-052-1/+7
| |
* | Add *_url helpers to get the full assets URLPrem Sichanugrist2012-02-045-2/+179
| | | | | | | | | | | | | | 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é Valim2012-02-042-19/+17
| |
* | Merge pull request #4869 from sikachu/master-responder-fixJosé Valim2012-02-044-8/+60
|\ \ | | | | | | Fix override API response bug in respond_with
| * | Fix override API response bug in respond_withPrem Sichanugrist2012-02-034-8/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 classkennyj2012-02-042-2/+9
| | |
* | | Merge pull request #4866 from bogdan/terminate_after_callbacksJosé Valim2012-02-041-3/+1
|\ \ \ | |/ / |/| | AS::Callbacks#define_callbacks: add :terminate_after_callbacks option
| * | AS::Callbacks: :skip_after_callbacks_if_terminated optionBogdan Gusiev2012-02-031-3/+1
| | |
* | | Merge pull request #4865 from bogdan/deprecate_per_keyJosé Valim2012-02-031-6/+4
|\ \ \ | | | | | | | | AC::Callbacks: remove usage of :per_key option from filters
| * | | AC::Callbacks: remove usage of :per_key option from filtersBogdan Gusiev2012-02-031-6/+4
| |/ /
* / / Verbose output for tests.Arun Agrawal2012-02-031-0/+1
|/ / | | | | | | | | See #3892
* | Remove default class to collection_check_boxes andRafael Mendonça França2012-02-025-30/+30
| | | | | | | | | | | | collection_radio_buttons [Carlos Antonio da Silva + Rafael Mendonça França]
* | Allow collection radio_buttons/check_boxes to access current text/valueCarlos Antonio da Silva2012-02-023-0/+60
| | | | | | | | [Carlos Antonio da Silva + Rafael Mendonça França]
* | Add changelog, docs and guides entriesCarlos Antonio da Silva2012-02-023-20/+120
| | | | | | | | [Carlos Antonio da Silva + Rafael Mendonça França]
* | Allow proc for value/text method in collection_selectCarlos Antonio da Silva2012-02-023-16/+48
| | | | | | | | | | | | 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 FormOptionsHelperCarlos Antonio da Silva2012-02-024-92/+81
| | | | | | | | [Carlos Antonio da Silva + Rafael Mendonça França]
* | Extract common collection helpers to a module to avoid too much inheritanceCarlos Antonio da Silva2012-02-023-69/+93
| | | | | | | | [Carlos Antonio da Silva + Rafael Mendonça França]
* | Create a Builder factory class to use with collection helpers + blockCarlos Antonio da Silva2012-02-023-21/+45
| | | | | | | | | | | | | | | | 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 callsCarlos Antonio da Silva2012-02-022-8/+18
| | | | | | | | [Carlos Antonio da Silva + Rafael Mendonça França]
* | Remove collection_wrapper* and item_wrapper* optionsCarlos Antonio da Silva2012-02-024-218/+15
| | | | | | | | [Carlos Antonio da Silva + Rafael Mendonça França]
* | Refactor value sanitization logicCarlos Antonio da Silva2012-02-022-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 bitCarlos Antonio da Silva2012-02-021-12/+12
| | | | | | | | [Carlos Antonio da Silva + Rafael Mendonça França]
* | Refactor option groups to use content_tagCarlos Antonio da Silva2012-02-021-4/+4
| | | | | | | | [Carlos Antonio da Silva + Rafael Mendonça França]
* | Add basic documentation to collection_check_boxes andRafael Mendonça França2012-02-021-0/+71
| | | | | | | | | | | | collection_radio_buttons [Carlos Antonio da Silva + Rafael Mendonça França]
* | Use @output_buffer variable instead of concat in testsCarlos Antonio da Silva2012-02-021-10/+9
| | | | | | | | [Carlos Antonio da Silva + Rafael Mendonça França]
* | Implement skipped testRafael Mendonça França2012-02-021-3/+5
| | | | | | | | [Carlos Antonio da Silva + Rafael Mendonça França]
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 04:23:53 +0000