Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
| * | removed deprecated methods, and related tests, from ActiveRecord | Josh Kalderimis | 2011-05-25 | 12 | -162/+4 |
| | | |||||
* | | 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 |
| | | | | #1264. | ||||
* | Merge pull request #1254 from pixeltrix/ignore-includes-in-through-scope | Jon Leighton | 2011-05-24 | 4 | -1/+16 |
|\ | | | | | Ignore :includes on through associations | ||||
| * | 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 |
| | | | | | | | | (as well as having Relation#arel respect the default scope). Fixes #1233. | ||||
* | | 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 for Rake::GemPackageTask deprecation warnings from Rake 0.9.0 | ||||
| * | | 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. ↵ | Aaron Patterson | 2011-05-24 | 1 | -1/+5 |
| | | | | | | | | | | | | fixes #796 | ||||
* | | | add tests surrounding behavior of save and save! for associations that have ↵ | Aaron Patterson | 2011-05-24 | 1 | -0/+26 |
| | | | | | | | | | | | | validation errors | ||||
* | | | 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 ↵ | Aaron Patterson | 2011-05-24 | 1 | -3/+1 |
| | | | | | | | | | | | | better trace without it | ||||
* | | | 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 |
|/ | | | | as per the last version of the yml specifications : http://www.yaml.org/spec/1.2/spec.html#* alias// | ||||
* | 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 |
|\ | | | | | Take into account time spent in AR even if a redirect occurs or if it is after the render | ||||
| * | Take into account time spent in AR even if a redirect occurs or if it is ↵ | Frederick Cheung | 2011-05-23 | 1 | -1/+3 |
| | | | | | | | | after the render | ||||
* | | Merge pull request #1184 from gnufied/master | Aaron Patterson | 2011-05-23 | 1 | -0/+1 |
|\ \ | | | | | | | Fixes connection_not established error while running db:schema:dump | ||||
| * | | fix connection not established error while running rake task | Bhavin Kamani | 2011-05-21 | 1 | -0/+1 |
| | | | | | | | | | | | | db:schema:dump | ||||
* | | | Revert "Take into account time spent in AR even if a redirect occurs or if ↵ | David Heinemeier Hansson | 2011-05-22 | 1 | -5/+3 |
| | | | | | | | | | | | | | | | | | | it is after the render" because it's causing test failures about missing db_during_render. This reverts commit 60b55baca9e381deb3a0a85580f089f4caf551d4. | ||||
* | | | Fix problem with loading polymorphic associations which have been defined in ↵ | Jon Leighton | 2011-05-22 | 5 | -15/+35 |
| | | | | | | | | | | | | an abstract superclass. Fixes #552. | ||||
* | | | Take into account time spent in AR even if a redirect occurs or if it is ↵ | Frederick Cheung | 2011-05-22 | 1 | -3/+5 |
| |/ |/| | | | | | after the render | ||||
* | | Adding pluralize_table_names change to CHANGELOG | Guillermo Iguaran | 2011-05-21 | 1 | -0/+8 |
| | | |||||
* | | Bump versions for rc1 | David Heinemeier Hansson | 2011-05-21 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1180 from Karunakar/documentation_change | Xavier Noria | 2011-05-21 | 2 | -4/+14 |
|\ \ | | | | | | | Documentation Error Fixed for ticket #839 | ||||
| * | | ActionMailer deliver method Documentation corrected Ticket #761 | Ganesh Kumar | 2011-05-21 | 1 | -1/+1 |
| | | | |||||
| * | | Documentation Error Fixed for ticket #839 | Karunakar (Ruby) | 2011-05-21 | 1 | -3/+13 |
| |/ | |||||
* | | Merge pull request #1187 from thedarkone/polymorphic-class-fix | Santiago Pastorino | 2011-05-21 | 2 | -1/+12 |
|\ \ | | | | | | | Handle polymorphic_type NOT NULL columns | ||||
| * | | Handle polymorphic_type NOT NULL-able columns as well. | thedarkone | 2011-05-21 | 2 | -1/+12 |
| | | | |||||
* | | | Add support for passing mass assignment roles to dynamic finders. Closes #1170. | Andrew White | 2011-05-21 | 2 | -2/+50 |
|/ / | |||||
* | | Merge pull request #1165 from arunagw/rubyforge_remove | José Valim | 2011-05-21 | 1 | -1/+0 |
|\ \ | | | | | | | Not updating rubyforge for new versions. | ||||
| * | | Not updating rubyforge for new versions. Result of "gem list -d rails" is ↵ | Arun Agrawal | 2011-05-20 | 1 | -1/+0 |
| | | | | | | | | | | | | not useful. | ||||
* | | | Merge pull request #1162 from guilleiguaran/singularize_individual_table_name | Jon Leighton | 2011-05-21 | 6 | -9/+16 |
|\ \ \ | |_|/ |/| | | Singularize individual table name | ||||
| * | | AliasTracker.pluralize use pluralize_table_names of model | Guillermo Iguaran | 2011-05-20 | 2 | -3/+3 |
| | | | |||||
| * | | Refactoring test_has_many_with_pluralize_table_names_false test | Guillermo Iguaran | 2011-05-20 | 2 | -4/+2 |
| | | | |||||
| * | | Allow pluralize_table_names for individual model | Guillermo Iguaran | 2011-05-20 | 2 | -2/+11 |
| | | | |||||
* | | | Merge pull request #1157 from smartinez87/extra_whitespaces | Xavier Noria | 2011-05-20 | 1 | -3/+3 |
|\ \ \ | |_|/ |/| | | Remove extra white spaces. |