aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | typecast columns based on the returned typesAaron Patterson2012-02-092-8/+15
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'master' into instance_readerAaron Patterson2012-02-0938-107/+175
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (30 commits) Bump tzinfo. 0.3.31 was released on November 6, 2011. Fix GH #4909. Dependency on TZInfo move from AR to AS. moving ordered hash to normal hash because ruby 1.9.3 hash defaultly ordered one Refactored the OrderedHash related stuff Replaced OrderedHash usage with Ruby 1.9 Hash Replaced OrderedHash with Hash for ruby 1.9 series removed unnecessary code replacing the orderhash with hash for ruby-1.9 Clean up some wording. Fix typo. test title changed corresponding to the test replaced active support ordered hash to ruby hash on active resource PostgreSQL does not work in the same way of the other adapters AR::Relation#pluck: improve to work with joins Fix match docs Fix attribute_before_type_cast for serialized attributes. Fixes #4837. Fix failing request test Fixes in AMo README Update README to mention lint. Trim down Active Model API by removing valid? and errors.full_messages ...
| * | | | | | | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-02-098-27/+19
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/relation/query_methods.rb
| | * | | | | | | | | | 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 docs
| | | * | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | $ 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.
| | * | | | | | | | | | 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.
| | * | | | | | | | | | | 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.
| | * | | | | | | | | | | 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 Hash
| | * | | | | | | | | | | 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 stuff
| | * | | | | | | | | | | | 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 ord...
| | * | | | | | | | | | | | 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 series
| | * | | | | | | | | | | 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.9
| | * | | | | | | | | | | 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 code
| | * | | | | | | | | | 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 test
| | * | | | | | | | | | test title changed corresponding to the testprasath2012-02-091-1/+1
| |/ / / / / / / / / /
| * | | | | | | | | | Merge pull request #4949 from ↵Xavier Noria2012-02-081-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 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 adapters
| | * | | | | | | | | | 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 hash on active model
| | * | | | | | | | | | replacing ordered hash to ruby hashprasath2012-02-085-9/+8
| | | |_|/ / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge pull request #4942 from bogdan/pluck_joinsJosé Valim2012-02-082-0/+14
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | AR::Relation#pluck: improve to work with joins
| | * | | | | | | | | | AR::Relation#pluck: improve to work with joinsBogdan Gusiev2012-02-082-0/+14
| |/ / / / / / / / / /
| * | | | | | | | | | Merge pull request #4934 from rafaelfranca/fix-docSantiago Pastorino2012-02-081-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | Fix match docs
| | * | | | | | | | | Fix match docsRafael Mendonça França2012-02-071-1/+1
| |/ / / / / / / / /
| * | | | | | | | | Fix attribute_before_type_cast for serialized attributes. Fixes #4837.Jon Leighton2012-02-073-0/+25
| | | | | | | | | |
| * | | | | | | | | 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
| * | | | | | | | | | Update README to mention lint.José Valim2012-02-071-4/+6
| | | | | | | | | | |
| * | | | | | | | | | Trim down Active Model API by removing valid? and errors.full_messagesJosé Valim2012-02-074-33/+17
| | | | | | | | | | |
| * | | | | | | | | | Merge pull request #4878 from vijaydev/ordinal-2072Xavier Noria2012-02-076-11/+67
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | PR #2072 with docs
| | * | | | | | | | | | Document Integer#ordinal available in PR #2072.Vijay Dev2012-02-043-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also remove an unasserted line in the tests.
| | * | | | | | | | | | Add ActiveSupport::Inflector.ordinal and Integer#ordinalTim Gildea2012-02-044-10/+50
| | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-23 09:12:15 +0000