| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 | ||||
| * | | 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 | 1 | -1/+1 |
| |\ \ | | | | | | | Handle polymorphic_type NOT NULL columns | ||||
| | * | | 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 |
| |\ \ | |/ |/| | Singularize individual table name | ||||
| | * | 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. | ||||
| | * | | 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 ↵ | Jon Leighton | 2011-05-19 | 2 | -5/+30 |
| | | | | | CollectionProxy with deprecations. Fixes #1148. | ||||
| * | Merge pull request #1097 from kirillrdy/master | Michael Koziarski | 2011-05-19 | 1 | -1/+1 |
| |\ | | | | | Improved "treat 0000-00-00 00:00:00 as nil Date" | ||||
| | * | 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 |
| | | | | | | | | | | | | | pg_namespace has not been used since this commit 29b0707f07f148d98515125dab44b73cfdc0a3d4 | ||||
| * | | | 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 |
| | |/ |/| | | | | | | | | | | | The build_association method was added as an API for plugins to hook into in 1398db0. This commit restores this API and the ability to override class.new to return a subclass based on a virtual attribute in the attributes hash. | ||||
| * | | Merge pull request #560 from guilleiguaran/fix_pluralize_table_names_false | Jon Leighton | 2011-05-16 | 1 | -1/+1 |
| |\ \ | | | | | | | Fixing has_many when ActiveRecord::Base.pluralize_table_names is false | ||||
| | * | | Fixing has_many association when ActiveRecord::Base.pluralize_table_names is ↵ | Guillermo Iguaran | 2011-05-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | false. fixes #557 | ||||
| * | | | Add doc to #attribute_names | Sebastian Martinez | 2011-05-15 | 1 | -0/+3 |
| | | | | |||||
| * | | | Add ActiveRecord::attribute_names to retrieve a list of attribute names. ↵ | Prem Sichanugrist | 2011-05-15 | 1 | -0/+8 |
| | |/ |/| | | | | | This method will also return an empty array on an abstract class or a model that the table doesn't exists. | ||||
| * | | These extra array operations appear to be unnecessary. Reasoning: | Jon Leighton | 2011-05-14 | 1 | -8/+2 |
| | | | | | | | | | | | * It is not necessary to subtract 'id' from the list of copied attributes because record and mem_record are equal, so therefore their id attributes are also equal (so there is no harm in copying it, and this reduces the complexity of the code) * It is not necessary to intersect the attribute names, since record and mem_record are equal, so they have the same id and class, so they have the same columns in the database. If record has non-column attributes then it seems reasonable to also copy them onto mem_record (though I am not sure what situation this would ever happen in) | ||||
| * | | CollectionAssociation#merge_target_lists should write to the underlying ↵ | Jon Leighton | 2011-05-14 | 1 | -5/+2 |
| | | | | | | | | | attributes when copying, rather than using the assignment method | ||||
| * | | 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 |
| | | |||||
| * | Reset ActiveRecord::LogSubscriber runtime at the start of each request | Tom Ward | 2011-05-14 | 1 | -0/+5 |
| | | | | | Previously the runtime was reset implicitly when #cleanup_view_runtime was called at the end of most requests. However, this doesn't happen when the request redirects, or send_file is called. Consequently, the ActiveRecord runtime recorded in the logs included the time taken for both the current request and the previous redirect. Explicitly resetting at the start of each request ensures that this can't happen, no matter what occurs previously. | ||||
| * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-05-14 | 1 | -1/+1 |
| |\ | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/date_helper.rb railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt | ||||
| | * | :touch => :symbol also updates the updated_at attribute | Bruno Michel | 2011-05-10 | 1 | -1/+1 |
| | | | |||||
| * | | Instead of doing find(:all) which does scoped.find(:all) which does ↵ | Jon Leighton | 2011-05-13 | 1 | -1/+1 |
| | | | | | | | | | scoped.all, just do scoped.all. | ||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |