aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into instance_readerAaron Patterson2012-02-1015-6/+121
|\
| * Merge pull request #4956 from mhfs/pg_partial_indicesAaron Patterson2012-02-1011-5/+77
| |\
| | * improved test case for partial indicesMarcelo Silveira2012-02-091-6/+9
| | * Made schema dumper recognize partial indices' where statementsMarcelo Silveira2012-02-097-2/+27
| | * Added where option to add_index to support postgresql partial indicesMarcelo Silveira2012-02-095-3/+47
| * | Merge pull request #4985 from shigeya/range_overlaps_to_use_coverAaron Patterson2012-02-102-1/+13
| |\ \
| | * | make Range#overlaps? accept Range of TimeShigeya Suzuki2012-02-092-1/+13
| * | | Merge pull request #4988 from kennyj/fix_4720-3Aaron Patterson2012-02-102-0/+31
| |\ \ \
| | * | | Fix GH #4720. Routing problem with nested namespace and already camelized con...kennyj2012-02-102-0/+31
| |/ / /
* | | | fixing indentation, moving class methods togetherAaron Patterson2012-02-091-124/+124
* | | | removing dead codeAaron Patterson2012-02-094-29/+0
* | | | typecast columns based on the returned typesAaron Patterson2012-02-092-8/+15
* | | | Merge branch 'master' into instance_readerAaron Patterson2012-02-0938-107/+175
|\| | |
| * | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-02-098-27/+19
| |\ \ \
| | * | | Clean up some wording.Ben Orenstein2012-02-081-2/+2
| | * | | Fix typo.Ben Orenstein2012-02-081-1/+1
| | * | | Fixes in AMo READMECarlos Antonio da Silva2012-02-071-5/+4
| | * | | Merge pull request #82 from simi/encode_withJosef Šimánek2012-02-061-1/+1
| | |\ \ \
| | | * | | Correcting ActiveRecord::Core#encode_with docsJosef Šimánek2012-02-071-1/+1
| | |/ / /
| | * | | use appropriate words for docs of Model.noneRohit Arondekar2012-02-071-2/+2
| | * | | minor tidy up of none relation query methodRohit Arondekar2012-02-061-2/+2
| | * | | Stop referring to Atom as "ATOM"Tom Stuart2012-02-054-5/+5
| | * | | Remove assert_select_feed from assert_select_encoded documentationTom Stuart2012-02-051-2/+2
| | * | | Update fixtures testing helpAmro Mousa2012-02-051-11/+4
| | * | | Fix code example in ActiveRecord::Relation#noneCarlos Antonio da Silva2012-02-011-3/+3
| * | | | Merge pull request #4975 from kennyj/bump_tzinfoAaron Patterson2012-02-091-1/+1
| |\ \ \ \
| | * | | | Bump tzinfo. 0.3.31 was released on November 6, 2011.kennyj2012-02-101-1/+1
| |/ / / /
| * | | | Merge pull request #4973 from kennyj/fix_4909Aaron Patterson2012-02-092-1/+1
| |\ \ \ \
| | * | | | Fix GH #4909. Dependency on TZInfo move from AR to AS.kennyj2012-02-102-1/+1
| |/ / / /
| * | | | Merge pull request #4963 from ram123naresh/update_rails_2_use1_9Santiago Pastorino2012-02-091-3/+1
| |\ \ \ \
| | * | | | Replaced OrderedHash usage with Ruby 1.9 HashUddhava2012-02-091-3/+1
| * | | | | Merge pull request #4965 from raghunadhd/fix_hashXavier Noria2012-02-091-2/+1
| |\ \ \ \ \
| | * | | | | Refactored the OrderedHash related stuffRaghunadh2012-02-091-2/+1
| * | | | | | Merge pull request #4966 from Karunakar/moving_ordered_hash_to_hashXavier Noria2012-02-091-5/+5
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | moving ordered hash to normal hash because ruby 1.9.3 hash defaultly ordered oneKarunakar (Ruby)2012-02-091-5/+5
| |/ / / / /
| * | | | | Merge pull request #4959 from ram123naresh/removed_ordered_hashVijay Dev2012-02-091-2/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Replaced OrderedHash with Hash for ruby 1.9 seriesUddhava2012-02-091-2/+1
| * | | | | Merge pull request #4957 from ganeshkumar/order_hash_changeXavier Noria2012-02-091-3/+2
| |\ \ \ \ \
| | * | | | | replacing the orderhash with hash for ruby-1.9ganesh2012-02-091-3/+2
| | |/ / / /
| * | | | | Merge pull request #4958 from ganeshkumar/order_hash_requireXavier Noria2012-02-091-1/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | removed unnecessary codeganesh2012-02-091-1/+0
| |/ / / /
| * | | | Merge pull request #4950 from ask4prasath/text_changesVijay Dev2012-02-081-1/+1
| |\ \ \ \
| | * | | | test title changed corresponding to the testprasath2012-02-091-1/+1
| |/ / / /
| * | | | Merge pull request #4949 from ask4prasath/ordered_hash_replacement_activereso...Xavier Noria2012-02-081-3/+1
| |\ \ \ \
| | * | | | replaced active support ordered hash to ruby hash on active resourceprasath2012-02-091-3/+1
| |/ / / /
| * | | | Merge pull request #4947 from rafaelfranca/fix-buildAaron Patterson2012-02-081-3/+7
| |\ \ \ \
| | * | | | PostgreSQL does not work in the same way of the other adaptersRafael Mendonça França2012-02-081-3/+7
| |/ / / /
| * | | | Merge pull request #4930 from ask4prasath/ordered_hash_replacedAaron Patterson2012-02-085-9/+8
| |\ \ \ \
| | * | | | replacing ordered hash to ruby hashprasath2012-02-085-9/+8
| | | |_|/ | | |/| |
| * | | | Merge pull request #4942 from bogdan/pluck_joinsJosé Valim2012-02-082-0/+14
| |\ \ \ \