Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Whitelist the methods which are called by multiparameter attribute assignment. | Michael Koziarski | 2009-06-10 | 1 | -8/+8 |
| | | | | This prevents users from causing NoMethodErrors and the like by editing the parameter names, and closes a potential exploit of CVE-2009-1904. | ||||
* | Remove 'core' fluff. Hookable ActiveSupport.load_all! | Jeremy Kemper | 2009-05-20 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2009-05-18 | 1 | -2/+2 |
|\ | |||||
| * | Remove unnecessary condition and local variable [#2602 state:resolved] | Emilio Tagua | 2009-05-18 | 1 | -2/+2 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2009-05-18 | 1 | -1/+1 |
|\| | |||||
| * | Make sure default_scope#create checks for options[:conditions] [#2181 ↵ | Pratik Naik | 2009-05-18 | 1 | -1/+1 |
| | | | | | | | | state:resolved] [James Le Cuirot] | ||||
* | | Missing 1.8.7 backport extensions | Jeremy Kemper | 2009-05-18 | 1 | -0/+1 |
|/ | |||||
* | Merge commit 'origin/master' | Yehuda Katz + Carl Lerche | 2009-05-14 | 1 | -9/+4 |
|\ | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/abstract/base.rb actionpack/lib/action_controller/routing.rb | ||||
| * | Changed ActiveRecord::Base#exists? to invoke find_initial so that it is ↵ | Peter Marklund | 2009-05-14 | 1 | -8/+3 |
|/ | | | | | | | compatible with, and doesn't lose, :include scopes (references to eager loaded tables) Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2543 state:committed] | ||||
* | Cherry-pick core extensions | Jeremy Kemper | 2009-05-13 | 1 | -6/+15 |
| | |||||
* | Opt in to Dependencies | Jeremy Kemper | 2009-04-22 | 1 | -0/+1 |
| | |||||
* | Ensure JoinAssociation uses aliased table name when multiple associations ↵ | Pratik Naik | 2009-04-20 | 1 | -2/+2 |
| | | | | have hash conditions on the same table | ||||
* | Merge docrails | Pratik Naik | 2009-03-24 | 1 | -10/+13 |
| | |||||
* | Merge docrails | Pratik Naik | 2009-03-16 | 1 | -2/+2 |
| | |||||
* | Fix spelling of an internal method [#1734 state:resolved] | Chris Kampmeier | 2009-03-12 | 1 | -3/+3 |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Don't duplicate :order from scope and options, it makes mysql do extra work | Jeremy Kemper | 2009-03-10 | 1 | -1/+3 |
| | |||||
* | Ensure nested with_scope merges conditions inside out [#2193 state:resolved] | Manfred Stienstra | 2009-03-10 | 1 | -11/+8 |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Allow find(:last) :order be a symbol [#2024 state:resolved] | Rob Anderton | 2009-03-09 | 1 | -1/+1 |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Fix find_by_last when order is given [#2127 state:committed] | Jan De Poorter | 2009-03-09 | 1 | -1/+1 |
| | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | Allow :having conditions to be sanitized like regular :condition. [#2158 ↵ | Will Bryant | 2009-03-06 | 1 | -2/+2 |
| | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Ensure supplie :from has precedence over scoped :from [#1370 state:resolved] | Pratik Naik | 2009-03-06 | 1 | -1/+1 |
| | |||||
* | Fix that scoped find with :group and :having [#2006 state:resolved] | Mike Gunderloy | 2009-02-28 | 1 | -1/+1 |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Merge with docrails | Pratik Naik | 2009-02-24 | 1 | -1/+2 |
| | |||||
* | Added ActiveRecord::Base.each and ActiveRecord::Base.find_in_batches for ↵ | David Heinemeier Hansson | 2009-02-23 | 1 | -1/+1 |
| | | | | batch processing [DHH/Jamis Buck] | ||||
* | support end-exclusive ... Ranges in SQL hash condition sanitization properly | Will Bryant | 2009-02-06 | 1 | -6/+10 |
| | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1865 state:committed] | ||||
* | Add ActiveRecord::Base.exists? with no args [#1817 state:committed] | Scott Taylor | 2009-02-05 | 1 | -2/+4 |
| | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | Add support for nested object forms to ActiveRecord and the helpers in ↵ | Eloy Duran | 2009-02-01 | 1 | -0/+5 |
| | | | | | | | | ActionPack Signed-Off-By: Michael Koziarski <michael@koziarski.com> [#1202 state:committed] | ||||
* | Ensure whitespaces are stripped when merging string joins. [#1297 ↵ | Filip H.F. "FiXato" Slagter | 2009-01-28 | 1 | -1/+1 |
| | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Add array id support to Model.update_counters. [#1254 state:resolved] ↵ | Pratik Naik | 2009-01-28 | 1 | -2/+17 |
| | | | | [Carlos Júnior] | ||||
* | Make sure inner scope conditions get a preference over the outer ones | Pratik Naik | 2009-01-24 | 1 | -2/+6 |
| | |||||
* | Merge docrails | Pratik Naik | 2009-01-18 | 1 | -48/+74 |
| | |||||
* | Merge branch 'master' of git@github.com:rails/rails | David Heinemeier Hansson | 2008-12-28 | 1 | -1/+47 |
|\ | |||||
| * | Inline code comments for class_eval/module_eval [#1657 state:resolved] | Xavier Noria | 2008-12-28 | 1 | -1/+47 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | | Introduce dynamic scopes for ActiveRecord: you can now use class methods ↵ | Yaroslav Markin | 2008-12-28 | 1 | -1/+24 |
|/ | | | | | | like scoped_by_user_name(user_name) and scoped_by_user_name_and_password(user_name, password) that will use the scoped method with attributes you supply. [#1648 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | Refactor ActiveRecord::Base#new_record? [#1647 state:committed] | Yaroslav Markin | 2008-12-27 | 1 | -1/+1 |
| | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | ActiveRecord::Base#new_record? now returns false for existing records (was ↵ | Yaroslav Markin | 2008-12-27 | 1 | -2/+2 |
| | | | | | | nil) [#1219 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | ActiveRecord::QueryCache middleware | Joshua Peek | 2008-12-22 | 1 | -1/+1 |
| | |||||
* | Ensure Model#last doesn't affects order for another finders inside the same ↵ | Daniel Luz | 2008-12-21 | 1 | -3/+8 |
| | | | | | | scope [#1499 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | Merge docrails | Pratik Naik | 2008-12-19 | 1 | -2/+1 |
| | |||||
* | Make exceptions raise from find_by_foo! have a more helpful message [#1567 ↵ | Frederick Cheung | 2008-12-18 | 1 | -1/+1 |
| | | | | state:resolved] | ||||
* | Update documentation for default_scope | Daniel Luz | 2008-12-16 | 1 | -2/+2 |
| | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | Benchmark.ms | Jeremy Kemper | 2008-12-09 | 1 | -2/+2 |
| | |||||
* | Merge with docrails | Pratik Naik | 2008-12-07 | 1 | -14/+42 |
| | |||||
* | Add :having option to find, to use in combination with grouped finds. Also ↵ | miloops | 2008-12-01 | 1 | -3/+6 |
| | | | | | | | added to has_many and has_and_belongs_to_many associations. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1028 state:committed] | ||||
* | get activerecord tests passing with lazy loading | Joshua Peek | 2008-11-24 | 1 | -0/+3 |
| | |||||
* | Autoload ActiveRecord files | Joshua Peek | 2008-11-24 | 1 | -0/+11 |
| | |||||
* | Docfix [#1444 state:committed] | David Heinemeier Hansson | 2008-11-23 | 1 | -2/+2 |
| | |||||
* | Fix default_scope to work in combination with named scopes | Tom Stuart | 2008-11-17 | 1 | -1/+1 |
| | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
* | Ensure shared default_scoping stack is duped before assigning to thread local | Joshua Peek | 2008-11-16 | 1 | -1/+1 |
| | |||||
* | Added default_scope to Base [#1381 state:committed] (Paweł Kondzior) | Pratik Naik | 2008-11-16 | 1 | -1/+15 |
| |