| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 | 1 | -1/+4 |
* | removing CSV fixture support | Aaron Patterson | 2011-05-23 | 1 | -52/+10 |
* | fixture file will validate fixture format | Aaron Patterson | 2011-05-23 | 1 | -1/+8 |
* | return an empty array for empty yaml files | Aaron Patterson | 2011-05-23 | 1 | -1/+3 |
* | 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 | 2 | -0/+44 |
* | 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 afte... | Frederick Cheung | 2011-05-23 | 1 | -1/+3 |
* | | Merge pull request #1184 from gnufied/master | Aaron Patterson | 2011-05-23 | 1 | -0/+1 |
|\ \ |
|
| * | | fix connection not established error while running rake task | Bhavin Kamani | 2011-05-21 | 1 | -0/+1 |
* | | | Revert "Take into account time spent in AR even if a redirect occurs or if it... | David Heinemeier Hansson | 2011-05-22 | 1 | -5/+3 |
* | | | Fix problem with loading polymorphic associations which have been defined in ... | Jon Leighton | 2011-05-22 | 3 | -13/+26 |
* | | | Take into account time spent in AR even if a redirect occurs or if it is afte... | Frederick Cheung | 2011-05-22 | 1 | -3/+5 |
| |/
|/| |
|
* | | 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 |
|\ \ |
|
| * | | 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 | 1 | -1/+1 |
|\ \ |
|
| * | | Handle polymorphic_type NOT NULL-able columns as well. | thedarkone | 2011-05-21 | 1 | -1/+1 |
* | | | Add support for passing mass assignment roles to dynamic finders. Closes #1170. | Andrew White | 2011-05-21 | 1 | -2/+2 |
|/ / |
|
* | | Merge pull request #1162 from guilleiguaran/singularize_individual_table_name | Jon Leighton | 2011-05-21 | 3 | -5/+5 |
|\ \
| |/
|/| |
|
| * | AliasTracker.pluralize use pluralize_table_names of model | Guillermo Iguaran | 2011-05-20 | 2 | -3/+3 |
| * | Allow pluralize_table_names for individual model | Guillermo Iguaran | 2011-05-20 | 1 | -2/+2 |
* | | Merge pull request #1157 from smartinez87/extra_whitespaces | Xavier Noria | 2011-05-20 | 1 | -3/+3 |
|\ \ |
|
| * | | Remove extra white spaces. | Sebastian Martinez | 2011-05-19 | 1 | -3/+3 |
| |/ |
|
* | | for => each in model migration template | Guillermo Iguaran | 2011-05-20 | 1 | -1/+1 |
* | | Syntax cleanup: for in => each | Guillermo Iguaran | 2011-05-19 | 3 | -3/+3 |
|/ |
|
* | Implement proxy_owner, proxy_target and proxy_reflection methods on Collectio... | Jon Leighton | 2011-05-19 | 2 | -5/+30 |
* | Merge pull request #1097 from kirillrdy/master | Michael Koziarski | 2011-05-19 | 1 | -1/+1 |
|\ |
|
| * | Year 0 should fall to nil only if month and day are also 0 | Kirill Radzikhovskyy | 2011-05-17 | 1 | -1/+1 |
* | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-05-18 | 2 | -17/+17 |
|\ \ |
|
| * | | Better doc styling in ActiveRecord::Locking | Sebastian Martinez | 2011-05-17 | 2 | -17/+17 |
* | | | on.upcase! | Akira Matsuda | 2011-05-19 | 1 | -1/+1 |
* | | | why not use JOIN statement for joining tables? (vol. 2) | Akira Matsuda | 2011-05-18 | 1 | -21/+12 |
* | | | remove unused table from FROM clause | Akira Matsuda | 2011-05-18 | 1 | -2/+0 |
* | | | why not use JOIN statement for joining tables? | Akira Matsuda | 2011-05-18 | 1 | -3/+3 |
* | | | Add missing require | Santiago Pastorino | 2011-05-17 | 1 | -0/+1 |
* | | | Don't pass a block as we are yielding | Andrew White | 2011-05-17 | 1 | -1/+1 |
* | | | Add block setting of attributes to singular associations | Andrew White | 2011-05-17 | 2 | -11/+12 |
* | | | Pass the attribute and option hashes to build_association | Andrew White | 2011-05-17 | 2 | -8/+12 |
| |/
|/| |
|
* | | Merge pull request #560 from guilleiguaran/fix_pluralize_table_names_false | Jon Leighton | 2011-05-16 | 1 | -1/+1 |
|\ \ |
|
| * | | Fixing has_many association when ActiveRecord::Base.pluralize_table_names is ... | Guillermo Iguaran | 2011-05-15 | 1 | -1/+1 |
* | | | Add doc to #attribute_names | Sebastian Martinez | 2011-05-15 | 1 | -0/+3 |
* | | | Add ActiveRecord::attribute_names to retrieve a list of attribute names. This... | Prem Sichanugrist | 2011-05-15 | 1 | -0/+8 |
| |/
|/| |
|
* | | These extra array operations appear to be unnecessary. Reasoning: | Jon Leighton | 2011-05-14 | 1 | -8/+2 |
* | | CollectionAssociation#merge_target_lists should write to the underlying attri... | Jon Leighton | 2011-05-14 | 1 | -5/+2 |
* | | An attempt to make CollectionAssociation#merge_target_lists make more sense. | Jon Leighton | 2011-05-14 | 1 | -16/+35 |
|/ |
|
* | Added some docs to controller runtime. | José Valim | 2011-05-14 | 1 | -1/+4 |