aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* AS::Callbacks: deprecate monkey patch of object callbacksBogdan Gusiev2012-09-073-8/+9
* Merge pull request #4976 from kreynolds/fix_eager_without_pkeyJon Leighton2012-09-072-1/+9
|\
| * Change JoinPart test from an integration to a unit testKelley Reynolds2012-07-052-13/+8
| * Fix eagerly loading associations without primary keysKelley Reynolds2012-02-092-1/+14
* | fix tests on Ruby 2.0.0Aaron Patterson2012-09-061-1/+1
* | Merge pull request #7549 from asanghi/masterCarlos Antonio da Silva2012-09-061-1/+1
|\ \
| * | fix bad changelog exampleAditya Sanghi2012-09-071-1/+1
* | | Merge pull request #7550 from sikachu/master-changelogCarlos Antonio da Silva2012-09-061-0/+6
|\ \ \ | |/ / |/| |
| * | Update Active Record CHANGELOG for #7419Prem Sichanugrist2012-09-061-0/+6
|/ /
* | Merge pull request #7419 from releu/fix-invalid-filename-migration-generatorJosé Valim2012-09-062-0/+16
|\ \
| * | add mini-validator on creating migrationJan Bernacki2012-09-062-0/+16
|/ /
* | Merge pull request #7542 from aaronrenner/patch-2José Valim2012-09-061-1/+1
|\ \
| * | Fixed around callback with lambda exampleAaron Renner2012-09-061-1/+1
|/ /
* | we already have the module objects, do not constantizeXavier Noria2012-09-061-2/+6
* | restores awesome commentXavier Noria2012-09-061-0/+19
* | no more const_missing combinatoricsXavier Noria2012-09-061-41/+2
* | Merge pull request #7397 from asanghi/masterJosé Valim2012-09-064-3/+58
|\ \
| * | Allow delivery method options to be set per mail instanceAditya Sanghi2012-09-044-3/+58
* | | Put the create_table block in a transaction.Rafael Mendonça França2012-09-051-2/+4
* | | Merge pull request #7527 from guedes/pg9.2_json_supportRafael Mendonça França2012-09-059-4/+135
|\ \ \
| * | | ActiveRecord support to PostgreSQL 9.2 JSON typeDickson S. Guedes2012-09-059-4/+135
|/ / /
* | | Add CHANGELOG entry for #7532 [ci skip]Rafael Mendonça França2012-09-051-0/+10
* | | Merge pull request #7532 from al2o3cr/fix_store_bugsRafael Mendonça França2012-09-053-4/+12
|\ \ \
| * | | correctly flag changed attributes in AR::Store, combine multiple calls to sto...Matt Jones2012-09-053-4/+12
| |/ /
* | | Merge pull request #7536 from pivotal/fix_pluck_with_reserved_wordsRafael Mendonça França2012-09-055-3/+21
|\ \ \
| * | | Fix pluck when columns/tables are reserved words.Ian Lesperance2012-09-055-3/+21
* | | | Merge pull request #7525 from seamusabshere/use-mysql-binary-for-rake-db-stru...Rafael Mendonça França2012-09-052-9/+10
|\ \ \ \ | |/ / / |/| | |
| * | | Use the 'mysql' binary for 'rake db:structure:load'.Seamus Abshere2012-09-052-9/+10
* | | | Define just the cattr_reader.Rafael Mendonça França2012-09-051-1/+2
* | | | Use the same logger that ActionView::Base for the DigestorRafael Mendonça França2012-09-052-16/+22
* | | | Remove unneeded requiresRafael Mendonça França2012-09-051-7/+3
* | | | Merge pull request #7337 from adzap/string_to_dummy_timeRafael Mendonça França2012-09-053-1/+23
|\ \ \ \
| * | | | Update changelog with time column type casting fixAdam Meehan2012-09-051-0/+4
| * | | | Fix for time type columns with invalid timeAdam Meehan2012-09-052-1/+19
* | | | | Merge pull request #7447 from etehtsea/postgresql-adapterRafael Mendonça França2012-09-057-988/+1038
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Modularize postgresql adapterKonstantin Shabanov2012-09-057-988/+1038
* | | | | Merge pull request #7530 from robin850/masterXavier Noria2012-09-051-1/+1
|\ \ \ \ \
| * | | | | Fix a typoRobin Dupret2012-09-051-1/+1
* | | | | | Merge pull request #7519 from leocassarani/merge-with-blockRafael Mendonça França2012-09-043-6/+50
|\ \ \ \ \ \
| * | | | | | Extend HashWithIndifferentAccess#update to take an optional blockLeo Cassarani2012-09-053-6/+50
|/ / / / / /
* | | | | | Merge pull request #7522 from lexmag/mime_typeRafael Mendonça França2012-09-042-85/+94
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Refactor `Mime::Type`Aleksey Magusev2012-09-052-85/+94
* | | | | | We dont need to include the name and the format in the digest -- source is au...David Heinemeier Hansson2012-09-041-1/+1
| |_|_|/ / |/| | | |
* | | | | Merge pull request #7422 from ernie/improvements-to-improved-routingDavid Heinemeier Hansson2012-09-043-14/+103
|\ \ \ \ \
| * | | | | Make enhanced routing Concerns more tell-don't-askErnie Miller2012-09-032-37/+70
| * | | | | Fix concerns not executing block in mapperErnie Miller2012-09-032-2/+29
| * | | | | Allow routing concerns to accept a callableErnie Miller2012-09-033-5/+34
* | | | | | revised the exception message "Expected #{file_path} to define #{qualified_na...Xavier Noria2012-09-041-1/+1
* | | | | | Merge pull request #7515 from senny/custom_inheritance_column_test_refactoringRafael Mendonça França2012-09-039-65/+66
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | test cleanup, remove ruby_type because it's no longer neededYves Senn2012-09-037-16/+5