| Commit message (Expand) | Author | Age | Files | Lines |
* | close statment only if its not closed | Hemant Kumar | 2011-05-28 | 1 | -1/+1 |
* | work around bug in the sqlite3 bindings. fixes #1289 | Aaron Patterson | 2011-05-27 | 1 | -0/+1 |
* | fixing test for mysql2 | Aaron Patterson | 2011-05-27 | 1 | -5/+2 |
* | adding a test for #1322 | Aaron Patterson | 2011-05-26 | 1 | -0/+15 |
* | Merge pull request #1323 from fx/association_primary_key | Jon Leighton | 2011-05-26 | 2 | -1/+11 |
|\ |
|
| * | added assertion for non-standard primary_key on models used in the primary_ke... | Marian Rudzynski | 2011-05-26 | 1 | -0/+3 |
| * | use association_primary_key in AssociationScope#add_constraints | Marian Rudzynski | 2011-05-26 | 2 | -1/+8 |
* | | Merge pull request #1318 from TheEmpty/master | Jon Leighton | 2011-05-26 | 3 | -19/+0 |
|\ \ |
|
| * | | Removes a now needless test - via Github | Mohammad Typaldos | 2011-05-26 | 1 | -8/+0 |
| * | | Removes the restriction on primary key when joining in a habtm && test that i... | Mohammad El-Abid | 2011-05-26 | 3 | -15/+4 |
| |/ |
|
* | | Don't merge base opts into includes when serializing ARs | John Mileham | 2011-05-26 | 1 | -6/+2 |
* | | Failing test - JSON serialization shouldn't merge base opts into include opts. | John Mileham | 2011-05-26 | 1 | -0/+9 |
|/ |
|
* | Merge branch 'master' of github.com:rails/rails | Xavier Noria | 2011-05-25 | 12 | -162/+4 |
|\ |
|
| * | Merge pull request #1285 from joshk/remove_active_record_deprecations | Aaron Patterson | 2011-05-25 | 12 | -162/+4 |
| |\ |
|
| | * | removed deprecated methods, and related tests, from ActiveRecord | Josh Kalderimis | 2011-05-25 | 12 | -162/+4 |
* | | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-05-25 | 29 | -83/+87 |
|\ \ \
| |/ /
|/| | |
|
| * | | changed http://api.rubyonrails.com to http://api.rubyonrails.org in readme f... | Karunakar (Ruby) | 2011-05-24 | 1 | -1/+1 |
| * | | Remove extra white spaces on ActiveRecord docs. | Sebastian Martinez | 2011-05-23 | 25 | -51/+51 |
| * | | has_many :dependent => :restrict raises an exception but is not documented ap... | Aditya Sanghi | 2011-05-22 | 1 | -2/+4 |
| * | | Add more doc to #update_column. | Sebastian Martinez | 2011-05-20 | 1 | -0/+2 |
| * | | Changing examples: use 'each' instead of 'for in' | Guillermo Iguaran | 2011-05-19 | 1 | -4/+4 |
| * | | Remove extra white-spaces. | Sebastian Martinez | 2011-05-19 | 1 | -24/+24 |
| * | | Closes GH #1032 | John Paul Ashenfelter | 2011-05-19 | 1 | -1/+1 |
* | | | Add the MIT-LICENSE to the Active Record gemspec | Franck Verrot | 2011-05-25 | 1 | -1/+1 |
* | | | Fix the AR::Base#inspect method [closes #1294] | Franck Verrot | 2011-05-25 | 1 | -6/+10 |
* | | | Test AR::Base#inspect on an allocated object not yet initialized | Franck Verrot | 2011-05-25 | 1 | -0/+8 |
* | | | Database.rake file fixed for load_generators | Arun Agrawal | 2011-05-25 | 1 | -2/+1 |
| |/
|/| |
|
* | | Everyone receives app as argument for consistency. | José Valim | 2011-05-25 | 1 | -2/+2 |
* | | Fix infinite recursion where a lazy default scope references a scope. Fixes #... | Jon Leighton | 2011-05-25 | 4 | -4/+36 |
* | | Merge pull request #1254 from pixeltrix/ignore-includes-in-through-scope | Jon Leighton | 2011-05-24 | 4 | -1/+16 |
|\ \ |
|
| * | | Ignore :includes on through associations | Andrew White | 2011-05-24 | 4 | -1/+16 |
* | | | Ensure that the surrounding code in Relation#to_a respects the default_scope ... | Jon Leighton | 2011-05-24 | 1 | -17/+24 |
* | | | Failing tests for #1233. | Andrew White | 2011-05-24 | 2 | -0/+75 |
* | | | Merge pull request #1274 from vijaydev/rake-packagetask-warning-fix | José Valim | 2011-05-24 | 1 | -2/+2 |
|\ \ \ |
|
| * | | | fixes Rake::GemPackageTask deprecation warnings from rake 0.9.0 | Vijay Dev | 2011-05-24 | 1 | -2/+2 |
* | | | | rescue record invalid exceptions and return false from the save method. fixes... | Aaron Patterson | 2011-05-24 | 1 | -1/+5 |
* | | | | add tests surrounding behavior of save and save! for associations that have v... | Aaron Patterson | 2011-05-24 | 1 | -0/+26 |
* | | | | adding a test for create! with invalid associations | Aaron Patterson | 2011-05-24 | 1 | -0/+9 |
* | | | | do not bother with assert_nothing_raised, the test will fail and we get a bet... | Aaron Patterson | 2011-05-24 | 1 | -3/+1 |
* | | | | Add failing test case for issue 796 | Joey Butler | 2011-05-24 | 1 | -0/+9 |
|/ / / |
|
* / / | properly reference yml alias nodes | dmathieu | 2011-05-24 | 3 | -4/+4 |
|/ / |
|
* | | Remove extra white-space on some exception messages. | Sebastian Martinez | 2011-05-23 | 6 | -7/+7 |
* | | fixing 1.8 support for new fixture tests | Aaron Patterson | 2011-05-23 | 3 | -4/+9 |
* | | removing CSV fixture support | Aaron Patterson | 2011-05-23 | 2 | -58/+10 |
* | | fixture file will validate fixture format | Aaron Patterson | 2011-05-23 | 2 | -1/+26 |
* | | return an empty array for empty yaml files | Aaron Patterson | 2011-05-23 | 2 | -1/+20 |
* | | use top level file constant for join, etc | Aaron Patterson | 2011-05-23 | 1 | -4/+4 |
* | | adding AR::Fixtures::File class to wrap a fixture file | Aaron Patterson | 2011-05-23 | 3 | -0/+90 |
* | | Removed AS core_ext/kernel/requires as it's not used and is bad practice. | Josh Kalderimis | 2011-05-23 | 3 | -3/+0 |
* | | Merge pull request #1228 from fcheung/db_time_fix2 | José Valim | 2011-05-23 | 1 | -1/+3 |
|\ \ |
|