| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | No need to pass options which is never used | Akira Matsuda | 2011-05-29 | 1 | -2/+2 |
| | | |||||
| * | No need to override for just calling super | Akira Matsuda | 2011-05-29 | 2 | -8/+0 |
| | | |||||
| * | stop using boolean expressions because of the side effects | Aaron Patterson | 2011-05-27 | 1 | -1/+4 |
| | | |||||
| * | Merge pull request #1365 from gnufied/sqlite3 | Aaron Patterson | 2011-05-27 | 2 | -2/+2 |
| |\ | | | | | close statment only if its not closed | ||||
| | * | delegate connection and column_hash calls directly to model | Hemant Kumar | 2011-05-28 | 1 | -1/+1 |
| | | | |||||
| | * | close statment only if its not closed | Hemant Kumar | 2011-05-28 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #1229 from workmad3/master | Aaron Patterson | 2011-05-27 | 1 | -2/+4 |
| |\ \ | |/ |/| | Fix for Issue #1205 | ||||
| | * | Using .try to test for the existence of a method option in a nil-resistent ↵ | David Workman | 2011-05-23 | 1 | -5/+2 |
| | | | | | | | | | manner. Inlined the determination of the options hash for reversing using a ternary operator. Shortens the method in a way that keeps the code neat | ||||
| | * | Neatened up the invert_add_index method as per suggeston | David Workman | 2011-05-23 | 1 | -2/+3 |
| | | | |||||
| | * | Simple fix for correctly inverting an add_index migration when a name has ↵ | David Workman | 2011-05-23 | 1 | -2/+6 |
| | | | | | | | | | been provided | ||||
| * | | work around bug in the sqlite3 bindings. fixes #1289 | Aaron Patterson | 2011-05-27 | 1 | -0/+1 |
| | | | |||||
| * | | Merge pull request #1323 from fx/association_primary_key | Jon Leighton | 2011-05-26 | 1 | -1/+1 |
| |\ \ | | | | | | | use association_primary_key in AssociationScope#add_constraints | ||||
| | * | | use association_primary_key in AssociationScope#add_constraints | Marian Rudzynski | 2011-05-26 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #1318 from TheEmpty/master | Jon Leighton | 2011-05-26 | 2 | -10/+0 |
| |\ \ \ | | | | | | | | | Resolve issue #534 | ||||
| | * | | | Removes the restriction on primary key when joining in a habtm && test that ↵ | Mohammad El-Abid | 2011-05-26 | 2 | -10/+0 |
| | |/ / | | | | | | | | | | it was properly removed | ||||
| * / / | Don't merge base opts into includes when serializing ARs | John Mileham | 2011-05-26 | 1 | -6/+2 |
| |/ / | | | | | | | | | | | Conflicts: activerecord/lib/active_record/serialization.rb | ||||
| * | | Merge branch 'master' of github.com:rails/rails | Xavier Noria | 2011-05-25 | 8 | -127/+4 |
| |\ \ | |||||
| | * \ | Merge pull request #1285 from joshk/remove_active_record_deprecations | Aaron Patterson | 2011-05-25 | 8 | -127/+4 |
| | |\ \ | | | | | | | | | removed deprecated methods, and related tests, from ActiveRecord | ||||
| | | * | | removed deprecated methods, and related tests, from ActiveRecord | Josh Kalderimis | 2011-05-25 | 8 | -127/+4 |
| | | | | | |||||
| * | | | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-05-25 | 28 | -82/+86 |
| |\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer/base.rb activesupport/lib/active_support/core_ext/kernel/requires.rb | ||||
| | * | | | 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 ↵ | Aditya Sanghi | 2011-05-22 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | appropriately. has_one also has :dependent => :restrict but is not documented at all. | ||||
| | * | | | 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 |
| | | | | | | | | | | | | | | | | | Fixed what looks like minor cut/paste error in documentation for ActiveRecord::Locking:Pessimistic | ||||
| * | | | | Fix the AR::Base#inspect method [closes #1294] | Franck Verrot | 2011-05-25 | 1 | -6/+10 |
| | | | | | |||||
| * | | | | 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 | 2 | -4/+13 |
| | | | | | | | | | | | | | #1264. | ||||
| * | | | Merge pull request #1254 from pixeltrix/ignore-includes-in-through-scope | Jon Leighton | 2011-05-24 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | Ignore :includes on through associations | ||||
| | * | | | Ignore :includes on through associations | Andrew White | 2011-05-24 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | 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. | ||||
| * | | | | rescue record invalid exceptions and return false from the save method. ↵ | Aaron Patterson | 2011-05-24 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | fixes #796 | ||||
| * | | | | properly reference yml alias nodes | dmathieu | 2011-05-24 | 2 | -3/+3 |
| |/ / / | | | | | | | | | | 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 | 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 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 | 3 | -13/+26 |
| | | | | | | | | | | | | | | | | | 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 | ||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |