Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Bump tzinfo. 0.3.31 was released on November 6, 2011. | kennyj | 2012-02-10 | 1 | -1/+1 |
| | |||||
* | Merge pull request #4973 from kennyj/fix_4909 | Aaron Patterson | 2012-02-09 | 2 | -1/+1 |
|\ | | | | | Fix GH #4909. Dependency on TZInfo move from AR to AS. | ||||
| * | Fix GH #4909. Dependency on TZInfo move from AR to AS. | kennyj | 2012-02-10 | 2 | -1/+1 |
|/ | |||||
* | Merge pull request #4963 from ram123naresh/update_rails_2_use1_9 | Santiago Pastorino | 2012-02-09 | 1 | -3/+1 |
|\ | | | | | Replaced OrderedHash usage with Ruby 1.9 Hash | ||||
| * | Replaced OrderedHash usage with Ruby 1.9 Hash | Uddhava | 2012-02-09 | 1 | -3/+1 |
| | | |||||
* | | Merge pull request #4965 from raghunadhd/fix_hash | Xavier Noria | 2012-02-09 | 1 | -2/+1 |
|\ \ | | | | | | | Refactored the OrderedHash related stuff | ||||
| * | | Refactored the OrderedHash related stuff | Raghunadh | 2012-02-09 | 1 | -2/+1 |
| | | | |||||
* | | | Merge pull request #4966 from Karunakar/moving_ordered_hash_to_hash | Xavier Noria | 2012-02-09 | 1 | -5/+5 |
|\ \ \ | |/ / |/| | | moving ordered hash to normal hash because ruby 1.9.3 hash defaultly ord... | ||||
| * | | moving ordered hash to normal hash because ruby 1.9.3 hash defaultly ordered one | Karunakar (Ruby) | 2012-02-09 | 1 | -5/+5 |
|/ / | |||||
* | | Merge pull request #4959 from ram123naresh/removed_ordered_hash | Vijay Dev | 2012-02-09 | 1 | -2/+1 |
|\ \ | |/ |/| | Replaced OrderedHash with Hash for ruby 1.9 series | ||||
| * | Replaced OrderedHash with Hash for ruby 1.9 series | Uddhava | 2012-02-09 | 1 | -2/+1 |
| | | |||||
* | | Merge pull request #4957 from ganeshkumar/order_hash_change | Xavier Noria | 2012-02-09 | 1 | -3/+2 |
|\ \ | | | | | | | replacing the orderhash with hash for ruby-1.9 | ||||
| * | | replacing the orderhash with hash for ruby-1.9 | ganesh | 2012-02-09 | 1 | -3/+2 |
| |/ | |||||
* | | Merge pull request #4958 from ganeshkumar/order_hash_require | Xavier Noria | 2012-02-09 | 1 | -1/+0 |
|\ \ | |/ |/| | removed unnecessary code | ||||
| * | removed unnecessary code | ganesh | 2012-02-09 | 1 | -1/+0 |
|/ | |||||
* | Merge pull request #4950 from ask4prasath/text_changes | Vijay Dev | 2012-02-08 | 1 | -1/+1 |
|\ | | | | | Test title changed corresponding to the test | ||||
| * | test title changed corresponding to the test | prasath | 2012-02-09 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #4949 from ↵ | Xavier Noria | 2012-02-08 | 1 | -3/+1 |
|\ | | | | | | | | | ask4prasath/ordered_hash_replacement_activeresource replaced active support ordered hash to ruby hash on active resource | ||||
| * | replaced active support ordered hash to ruby hash on active resource | prasath | 2012-02-09 | 1 | -3/+1 |
|/ | |||||
* | Merge pull request #4947 from rafaelfranca/fix-build | Aaron Patterson | 2012-02-08 | 1 | -3/+7 |
|\ | | | | | PostgreSQL does not work in the same way of the other adapters | ||||
| * | PostgreSQL does not work in the same way of the other adapters | Rafael Mendonça França | 2012-02-08 | 1 | -3/+7 |
|/ | |||||
* | Merge pull request #4930 from ask4prasath/ordered_hash_replaced | Aaron Patterson | 2012-02-08 | 5 | -9/+8 |
|\ | | | | | Replacing ordered hash to ruby hash on active model | ||||
| * | replacing ordered hash to ruby hash | prasath | 2012-02-08 | 5 | -9/+8 |
| | | |||||
* | | Merge pull request #4942 from bogdan/pluck_joins | José Valim | 2012-02-08 | 2 | -0/+14 |
|\ \ | | | | | | | AR::Relation#pluck: improve to work with joins | ||||
| * | | AR::Relation#pluck: improve to work with joins | Bogdan Gusiev | 2012-02-08 | 2 | -0/+14 |
|/ / | |||||
* | | Merge pull request #4934 from rafaelfranca/fix-doc | Santiago Pastorino | 2012-02-08 | 1 | -1/+1 |
|\ \ | | | | | | | Fix match docs | ||||
| * | | Fix match docs | Rafael Mendonça França | 2012-02-07 | 1 | -1/+1 |
|/ / | |||||
* | | Fix attribute_before_type_cast for serialized attributes. Fixes #4837. | Jon Leighton | 2012-02-07 | 3 | -0/+25 |
| | | |||||
* | | Merge pull request #4932 from carlosantoniodasilva/fix-request-test | José Valim | 2012-02-07 | 1 | -1/+1 |
|\ \ | | | | | | | Fix failing request test | ||||
| * | | 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 | ||||
* | | | Update README to mention lint. | José Valim | 2012-02-07 | 1 | -4/+6 |
| | | | |||||
* | | | Trim down Active Model API by removing valid? and errors.full_messages | José Valim | 2012-02-07 | 4 | -33/+17 |
| | | | |||||
* | | | Merge pull request #4878 from vijaydev/ordinal-2072 | Xavier Noria | 2012-02-07 | 6 | -11/+67 |
|\ \ \ | | | | | | | | | PR #2072 with docs | ||||
| * | | | Document Integer#ordinal available in PR #2072. | Vijay Dev | 2012-02-04 | 3 | -2/+18 |
| | | | | | | | | | | | | | | | | Also remove an unasserted line in the tests. | ||||
| * | | | Add ActiveSupport::Inflector.ordinal and Integer#ordinal | Tim Gildea | 2012-02-04 | 4 | -10/+50 |
| | | | | |||||
* | | | | always flush all logs. fixes #4277 | Aaron Patterson | 2012-02-07 | 1 | -1/+1 |
| |/ / |/| | | |||||
* | | | 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 |
| | | |