| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | | | | | | | | minor fixes in generators | Vijay Dev | 2011-02-09 | 1 | -10/+12 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Add note that validates_length_of will incorrectly pluralize min. length 1 | Kevin Skoglund | 2011-02-07 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | ActiveRecord :default_timezone is :utc in Rails, as set by ↵ | Paul Annesley | 2011-02-06 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | active_record/railtie.rb | |||||
| | * | | | | | | | | | | | | fix minor typo | Vijay Dev | 2011-02-07 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Add CSS fix for WebKit/Mac rendering issue. | Henry Phan | 2011-02-05 | 2 | -0/+18 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Change validates inclusion to use cover? for Ranges in ruby 1.9 [#6453 ↵ | Frederick Cheung | 2011-02-18 | 2 | -3/+29 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | state:committed] Signed-off-by: Xavier Noria <fxn@hashref.com> | |||||
| * | | | | | | | | | | | | | Merge remote branch 'rails/master' into identity_map | Emilio Tagua | 2011-02-18 | 2 | -9/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | Remove test which was broken on 1.8. This test is now irrelevant since ↵ | Jon Leighton | 2011-02-18 | 1 | -8/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | singular associations no longer return a proxy object. | |||||
| | * | | | | | | | | | | | | | just use the list of column names to generate attribute methods | Aaron Patterson | 2011-02-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Don't use skip, just don't run anything, we don't have skip in Ruby 1.8 | Emilio Tagua | 2011-02-18 | 2 | -8/+4 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Remove nbproject form gitignore. This shouldn't be here in the first place. | Emilio Tagua | 2011-02-18 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | WeakHash is not used, remove it. | Emilio Tagua | 2011-02-18 | 2 | -74/+0 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | No need to have reinit_with inside an InstanceMethods module. | Emilio Tagua | 2011-02-18 | 1 | -17/+15 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Initialize @target instead asking if it is defined. | Emilio Tagua | 2011-02-18 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Should use "=" instead "replace" after this commit: ↵ | Emilio Tagua | 2011-02-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1644663ba7f678d178deab2bf1629dc05626f85b | |||||
| * | | | | | | | | | | | | | | No need to test agaisnt target. | Emilio Tagua | 2011-02-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Reindent and remove wrong line left in merge by mistake. | Emilio Tagua | 2011-02-18 | 1 | -4/+3 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Use to_a instead :load in test, since :load changed. | Emilio Tagua | 2011-02-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | No need to test against target anymore. | Emilio Tagua | 2011-02-18 | 1 | -8/+8 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge remote branch 'rails/master' into identity_map | Emilio Tagua | 2011-02-18 | 47 | -791/+865 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/association.rb activerecord/lib/active_record/fixtures.rb | |||||
| | * | | | | | | | | | | | | | Split AssociationProxy into an Association class (and subclasses) which ↵ | Jon Leighton | 2011-02-18 | 26 | -502/+392 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | manages the association, and a CollectionProxy class which is *only* a proxy. Singular associations no longer have a proxy. See CHANGELOG for more. | |||||
| | * | | | | | | | | | | | | | Add :nodoc: to ThroughAssociation and HasOneAssociation | Jon Leighton | 2011-02-18 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | Allow building and then later saving has_many :through records, such that ↵ | Jon Leighton | 2011-02-18 | 7 | -12/+124 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the join record is automatically saved too. This requires the :inverse_of option to be set on the source association in the join model. See the CHANGELOG for details. [#4329 state:resolved] | |||||
| | * | | | | | | | | | | | | | Ensure that association_ids uses the correct attribute where the association ↵ | Jon Leighton | 2011-02-18 | 4 | -2/+20 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is a has_many :through with a :primary_key option on the source reflection. [#6376 state:resolved] | |||||
| | * | | | | | | | | | | | | | Remove unused line in test setup. | Ben Orenstein | 2011-02-17 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [#6442 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
| | * | | | | | | | | | | | | | explicitly allowing lolqueries | Aaron Patterson | 2011-02-16 | 2 | -13/+11 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | use the arel table rather than generating strings | Aaron Patterson | 2011-02-16 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | no need for Array.wrap | Aaron Patterson | 2011-02-16 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | fixing whitespace problems | Aaron Patterson | 2011-02-16 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | removed an unnecessary second query when passing an ActiveRecord::Relation ↵ | Steven Fenigstein | 2011-02-16 | 2 | -2/+32 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to a where clause. And added ability to use subselects in where clauses. | |||||
| | * | | | | | | | | | | | | | Fixed issue #6363, avoid to pluralized already pluralized names and ↵ | Timothy N. Tsvetkov | 2011-02-16 | 2 | -2/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | singularize a single in generators, for example stadia is a valid plural for stadium. But calling pluralize for stadia will return stadias which sematically is not corrent in this case [#6363 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
| | * | | | | | | | | | | | | | handle double pluralization for irregular plurals | Dan Pickett | 2011-02-16 | 3 | -0/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [#6363] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
| | * | | | | | | | | | | | | | Remove unused code. | Ben Orenstein | 2011-02-16 | 1 | -3/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [#6437 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
| | * | | | | | | | | | | | | | fixture methods can be overridden and super() is useful | Aaron Patterson | 2011-02-15 | 2 | -14/+32 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | fixing variable names to reflect reality | Aaron Patterson | 2011-02-15 | 1 | -11/+11 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | this is in the AR namespace, so AR must exist | Aaron Patterson | 2011-02-15 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | GcTime incorrectly checks GC.respond_to?(:total_time), it should check ↵ | Joel Nimety | 2011-02-15 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GC::Profiler.respond_to?(:total_time) [#6435 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
| | * | | | | | | | | | | | | | Optimization for postgres adapter for add_column method. Set default and not ↵ | Timothy N. Tsvetkov | 2011-02-15 | 1 | -6/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | null in one query | |||||
| | * | | | | | | | | | | | | | fixing variable names, removing FixtureFile instances from test ivars | Aaron Patterson | 2011-02-15 | 2 | -21/+14 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | removing unused variable | Aaron Patterson | 2011-02-15 | 1 | -3/+1 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | ActiveResource validation tests did not test ActiveModel validations. Adjust ↵ | Ken Mazaika | 2011-02-15 | 2 | -13/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the test to be done the Rails3 way. Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
| | * | | | | | | | | | | | | | fixed broken link to postgresql docs | Sergii Boiko | 2011-02-15 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
| * | | | | | | | | | | | | | | Fix expected queries in relation tests. | Emilio Tagua | 2011-02-15 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Don't shadow outer local variable. | Emilio Tagua | 2011-02-15 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Run tests without IdentityMap when IM=false is given. | Emilio Tagua | 2011-02-15 | 6 | -15/+23 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Remove identity map from benchmark script. | Emilio Tagua | 2011-02-15 | 1 | -7/+0 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge remote branch 'rails/master' into identity_map | Emilio Tagua | 2011-02-15 | 430 | -9198/+12029 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/examples/performance.rb activerecord/lib/active_record/association_preload.rb activerecord/lib/active_record/associations.rb activerecord/lib/active_record/associations/association_proxy.rb activerecord/lib/active_record/autosave_association.rb activerecord/lib/active_record/base.rb activerecord/lib/active_record/nested_attributes.rb activerecord/test/cases/relations_test.rb | |||||
| | * | | | | | | | | | | | | | bad tests are bad | Aaron Patterson | 2011-02-14 | 1 | -18/+0 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | remove accidental raise! | Aaron Patterson | 2011-02-14 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | removing irrelevant test | Aaron Patterson | 2011-02-14 | 2 | -18/+1 | |
| | | | | | | | | | | | | | | | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Eilertsens Kodeknekkeri |
| aboutsummaryrefslogtreecommitdiffstats |