Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed styles when browser is narrower than 69em. | Jeff Dickey | 2012-02-09 | 1 | -0/+1 |
| | |||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-02-09 | 8 | -27/+19 |
|\ | | | | | | | | | Conflicts: activerecord/lib/active_record/relation/query_methods.rb | ||||
| * | Clean up some wording. | Ben Orenstein | 2012-02-08 | 1 | -2/+2 |
| | | |||||
| * | Fix typo. | Ben Orenstein | 2012-02-08 | 1 | -1/+1 |
| | | |||||
| * | Fixes in AMo README | Carlos Antonio da Silva | 2012-02-07 | 1 | -5/+4 |
| | | |||||
| * | Merge pull request #82 from simi/encode_with | Josef Šimánek | 2012-02-06 | 1 | -1/+1 |
| |\ | | | | | | | Correcting ActiveRecord::Core#encode_with docs | ||||
| | * | Correcting ActiveRecord::Core#encode_with docs | Josef Šimánek | 2012-02-07 | 1 | -1/+1 |
| |/ | |||||
| * | use appropriate words for docs of Model.none | Rohit Arondekar | 2012-02-07 | 1 | -2/+2 |
| | | |||||
| * | minor tidy up of none relation query method | Rohit Arondekar | 2012-02-06 | 1 | -2/+2 |
| | | |||||
| * | Stop referring to Atom as "ATOM" | Tom Stuart | 2012-02-05 | 4 | -5/+5 |
| | | | | | | | | | | | | $ 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. | ||||
| * | Update fixtures testing help | Amro Mousa | 2012-02-05 | 1 | -11/+4 |
| | | |||||
| * | Fix code example in ActiveRecord::Relation#none | Carlos Antonio da Silva | 2012-02-01 | 1 | -3/+3 |
| | | |||||
* | | Merge pull request #4975 from kennyj/bump_tzinfo | Aaron Patterson | 2012-02-09 | 1 | -1/+1 |
|\ \ | | | | | | | Bump tzinfo. 0.3.31 was released on November 6, 2011. | ||||
| * | | 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 |
| |/ / / |/| | | |