Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix failing request test | Carlos Antonio da Silva | 2012-02-07 | 1 | -1/+1 |
| | | | | | | | | Latest changes in remote ip handling conflicted with each other in tests. Related: dd09811fa6214a130fdc2de1d4c00b4337cb15f9 6a720226aad2adffcbd2422d40db772719579e2f | ||||
* | no need to check for this constant | Xavier Noria | 2012-02-07 | 1 | -1/+1 |
| | |||||
* | Merge pull request #4928 from rmm5t/fix_force_ssl_redirect_with_params_master | José Valim | 2012-02-07 | 4 | -0/+24 |
|\ | | | | | Fix force_ssl redirect with params | ||||
| * | 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 | 3 | -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_order | José Valim | 2012-02-07 | 2 | -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 IP | Greg Sterndale | 2012-02-07 | 2 | -5/+5 |
| | | |||||
* | | Fix that failed tests should exit with a nonzero error code. | Jeremy Kemper | 2012-02-07 | 2 | -31/+17 |
| | | | | | | | | | | | | Partially reverts 14c89e7285d4e7cd40a542fbc31d9345f60c3aa4. Hat tip to @tenderlove for paring down the TestTask! | ||||
* | | Merge pull request #2632 from gsterndale/replace_trusted_proxies | José Valim | 2012-02-07 | 2 | -6/+19 |
|\ \ | | | | | | | Trusted proxies are configurable | ||||
| * | | Trusted proxies is replaced with a Regexp or appended to with a String | Greg Sterndale | 2012-02-07 | 2 | -6/+19 |
| |/ | |||||
* | | Merge pull request #4926 from iblue/master | Xavier Noria | 2012-02-07 | 1 | -1/+2 |
|\ \ | | | | | | | Fixed documenation | ||||
| * | | Fixed the documenation for 'to_xml' | Markus Fenske | 2012-02-07 | 1 | -1/+2 |
| |/ | |||||
* | | Merge pull request #4918 from scottwb/fix-single-accept-with-q | José Valim | 2012-02-07 | 2 | -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. Bradley | 2012-02-06 | 1 | -1/+3 |
| | | |||||
| * | Failing test case that shows issue #736 should still be open. | Scott W. Bradley | 2012-02-06 | 1 | -0/+6 |
| | | |||||
* | | Merge pull request #4924 from rafaelfranca/fix-asset_tag | José Valim | 2012-02-07 | 2 | -16/+16 |
|\ \ | |/ |/| | Fix audio_tag and video_tag helpers | ||||
| * | Always use content_tag for audio/video tag | Rafael Mendonça França | 2012-02-07 | 2 | -16/+16 |
|/ | | | | Closes #4919 | ||||
* | adding a comment for myself | Aaron Patterson | 2012-02-06 | 2 | -8/+9 |
| | |||||
* | delegate attribute typecasting to the column | Aaron Patterson | 2012-02-06 | 2 | -16/+17 |
| | |||||
* | pg supports real booleans, so handle the case when `true` is returned | Aaron Patterson | 2012-02-06 | 1 | -2/+5 |
| | |||||
* | let automatic EXPLAIN ignore CACHE notifications | Xavier Noria | 2012-02-03 | 2 | -1/+52 |
| | |||||
* | Merge pull request #4905 from herimedia/to-infinity-and-beyond | Aaron Patterson | 2012-02-06 | 2 | -2/+20 |
|\ | | | | | Infinity should be a valid validates_length_of maximum | ||||
| * | To infinity… and beyond! | Niels Ganser | 2012-02-06 | 2 | -2/+20 |
| | | | | | | | | | | | | | | Allow infinite values for validates_length_of. Particularly useful for prettily defining an open ended range such as validates_length_of :human_stupidity, :within => 0..Float::INFINITY | ||||
* | | Merge pull request #4910 from ↵ | Aaron Patterson | 2012-02-06 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | sskirby/fixes_regression_in_postgres_template_support prevents the database.yml template option from being passed to PGConn | ||||
| * | | prevents the database.yml template option from being passed to PGConn | Sean Kirby | 2012-02-06 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #4908 from kennyj/fix_3864 | José Valim | 2012-02-06 | 2 | -1/+34 |
|\ \ | |/ |/| | Fix url_for method's behavior. GH #3684. | ||||
| * | Fix url_for method's behavior when it is called with :controller option ↵ | kennyj | 2012-02-07 | 2 | -1/+34 |
|/ | | | | | | which starts with "/" from multiple nested controller. Closes #3864 | ||||
* | Merge pull request #4900 from lest/patch-1 | José Valim | 2012-02-05 | 1 | -0/+2 |
|\ | | | | | allow mass-assign version attribute in AR::SchemaMigration | ||||
| * | allow mass-assign version attribute in AR::SchemaMigration | Sergey Nartimov | 2012-02-06 | 1 | -0/+2 |
| | | |||||
* | | 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 | 2 | -13/+1 |
|/ | | | | | | | | | | Too painful to lose the compact shorthand form! This reverts commit e848c52535fa0f9488cdbdb3f1cedc7c7c02d643. Conflicts: actionpack/lib/action_dispatch/routing/mapper.rb | ||||
* | Get ActiveRecord::TestCase back on its feet, despite deprecation. It ↵ | Jeremy Kemper | 2012-02-05 | 3 | -92/+68 |
| | | | | requires SQLCounter which was moved to AR internal tests only. | ||||
* | Merge pull request #4893 from bcardarella/mark_for_highlight | José Valim | 2012-02-05 | 3 | -16/+19 |
|\ | | | | | Highlight defaults to HTML5 `mark` element | ||||
| * | Highlight defaults to HTML5 `mark` element | Brian Cardarella | 2012-02-05 | 3 | -16/+19 |
| | | |||||
* | | Merge pull request #4881 from al2o3cr/compatible_json_errors | Jeremy Kemper | 2012-02-05 | 3 | -6/+83 |
|\ \ | |/ |/| | Make ActiveResource error parsing interoperate with ActionController. Closes #4881. | ||||
| * | add handling for backwards-compatibility and update documentation | Matt Jones | 2012-02-04 | 3 | -4/+67 |
| | | |||||
| * | Merge remote-tracking branch 'odorcicd/fix_activeresource_json_errors' into ↵ | Matt Jones | 2012-02-04 | 2 | -4/+18 |
| |\ | | | | | | | | | | compatible_json_errors | ||||
| | * | Fix ActiveResource JSON error parser and incorrect tests | Denis Odorcic | 2011-09-16 | 2 | -4/+18 |
| | | | |||||
* | | | Merge pull request #4892 from bkzl/master | José Valim | 2012-02-05 | 2 | -12/+14 |
|\ \ \ | | | | | | | | | Display annotations from .coffee files in `rake notes` | ||||
| * | | | Display annotations from .coffee files in `rake notes` | Bartlomiej Kozal | 2012-02-05 | 2 | -12/+14 |
|/ / / | |||||
* | | | Merge pull request #4891 from kennyj/fix_4883 | Santiago Pastorino | 2012-02-05 | 2 | -3/+4 |
|\ \ \ | | | | | | | | | [master] Optional start_day argument for Time#all_week. | ||||
| * | | | Optional start_day argument for Time#all_week. | kennyj | 2012-02-06 | 2 | -3/+4 |
|/ / / | | | | | | | | | | Closes #4883 | ||||
* | | | Merge pull request #4888 from kennyj/fix_2982 | José Valim | 2012-02-05 | 2 | -1/+7 |
|\ \ \ | | | | | | | | | Add a testcase for non english filename. Related to #2982. | ||||
| * | | | Add testcase for non english filename. Related to #2982. | kennyj | 2012-02-05 | 2 | -1/+7 |
| | | | | |||||
* | | | | Merge pull request #4886 from bogdan/callbacks_cleanup | José Valim | 2012-02-05 | 1 | -17/+13 |
|\ \ \ \ | |/ / / |/| | | | AS::Callbacks: remove unused code | ||||
| * | | | AS::Callbacks: remove unused code | Bogdan Gusiev | 2012-02-05 | 1 | -17/+13 |
|/ / / | |||||
* | | | Merge pull request #4875 from sikachu/master-asset-url | José Valim | 2012-02-05 | 6 | -2/+203 |
|\ \ \ | | | | | | | | | Add *_url helpers to get the full assets URL | ||||
| * | | | Add *_url helpers to get the full assets URL | Prem Sichanugrist | 2012-02-04 | 6 | -2/+203 |
|/ / / | | | | | | | | | | | | | | | | | | | 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 | 4 | -8/+60 |
|\ \ \ | | | | | | | | | Fix override API response bug in respond_with |