Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Deletes trailing whitespaces (over text files only find * -type f -exec sed ↵ | Santiago Pastorino | 2010-08-14 | 1 | -172/+172 |
| | | | | 's/[ \t]*$//' -i {} \;) | ||||
* | converting to a symbol is not necessary | Aaron Patterson | 2010-08-13 | 1 | -1/+1 |
| | |||||
* | Removing most of the symbol to proc usage in Active Record | Prem Sichanugrist | 2010-08-13 | 1 | -6/+6 |
| | | | | This will hopefully make Active Record run a bit more faster. | ||||
* | be more precise re :validate and :autosave | Xavier Noria | 2010-08-12 | 1 | -4/+4 |
| | |||||
* | revises some autosave docs, style and content | Xavier Noria | 2010-08-12 | 1 | -2/+1 |
| | |||||
* | adding more documentation for autosave option | Neeraj Singh | 2010-08-09 | 1 | -1/+2 |
| | |||||
* | updating documentation for method configure_dependency_for_has_many | Neeraj Singh | 2010-08-06 | 1 | -8/+5 |
| | |||||
* | Merge remote branch 'docrails/master' into 3-0-stable | Xavier Noria | 2010-08-03 | 1 | -182/+269 |
|\ | |||||
| * | ensuring that documentation does not exceed 100 columns | Neeraj Singh | 2010-08-01 | 1 | -180/+267 |
| | | |||||
| * | fixing documentation just a little bit | Neeraj Singh | 2010-07-31 | 1 | -2/+2 |
| | | |||||
* | | Remove duplicated logic. | José Valim | 2010-08-02 | 1 | -7/+9 |
| | | |||||
* | | Eager loading an association should not change the count of children | Neeraj Singh | 2010-08-02 | 1 | -0/+4 |
| | | | | | | | | | | | | [#4971 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | Tidy up previous commit. | José Valim | 2010-08-02 | 1 | -3/+3 |
| | | |||||
* | | test and fix collection_singular_ids= with string primary keys [#5125 ↵ | Robert Pankowecki | 2010-08-02 | 1 | -1/+3 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | Add an internal (private API) after_touch callback. [#5271 state:resolved] | José Valim | 2010-08-02 | 1 | -0/+1 |
|/ | |||||
* | removed ambiguity from autosave description | Simon Tokumine | 2010-07-28 | 1 | -1/+1 |
| | |||||
* | Added missing require of remove_method | Łukasz Strzałkowski | 2010-07-19 | 1 | -0/+1 |
| | |||||
* | Make use of redefine_method, removed some more redefining warnings | Łukasz Strzałkowski | 2010-07-19 | 1 | -27/+12 |
| | |||||
* | Removed warnings about method redefining | Łukasz Strzałkowski | 2010-07-19 | 1 | -9/+24 |
| | |||||
* | JoinDependency#graft does not properly set parent join [#5124 state:resolved] | David Genord II | 2010-07-16 | 1 | -1/+1 |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | clean up ||= with an initialized variable and attr_reader | Aaron Patterson | 2010-07-14 | 1 | -5/+2 |
| | |||||
* | Merge remote branch 'docrails/master' | Xavier Noria | 2010-07-07 | 1 | -0/+4 |
|\ | |||||
| * | added more info about << operation in associations | Neeraj Singh | 2010-07-06 | 1 | -0/+4 |
| | | |||||
* | | documents automatic management of join models in hmt associations, in ↵ | Xavier Noria | 2010-07-06 | 1 | -4/+11 |
|/ | | | | particular the gotcha that deletion is direct | ||||
* | Improve documentation for assocations :autosave option. | Edgars Beigarts | 2010-06-22 | 1 | -4/+12 |
| | |||||
* | Merge remote branch 'rails/master' | Xavier Noria | 2010-06-20 | 1 | -1/+1 |
|\ | | | | | | | | | Conflicts: actionpack/lib/abstract_controller/base.rb | ||||
| * | remove executable permission from files that don't need it. [#4802 ↵ | rohit | 2010-06-20 | 1 | -0/+0 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | ActiveRecord and ActionPack now use the new descendants implementation. | José Valim | 2010-06-19 | 1 | -1/+1 |
| | | |||||
* | | Active Record Associations - minor change of DeleteRestrictionError doc for ↵ | Bryan Woods | 2010-06-15 | 1 | -1/+1 |
| | | | | | | | | clarity | ||||
* | | Fix a bunch of minor spelling mistakes | Evgeniy Dolzhenko | 2010-06-15 | 1 | -5/+5 |
|\ \ | |/ |/| | |||||
| * | Fix a bunch of minor spelling mistakes | Evgeniy Dolzhenko | 2010-06-11 | 1 | -5/+5 |
| | | |||||
* | | edit pass: the names of Rails components have a space, ie, "Active Record", ↵ | Xavier Noria | 2010-06-14 | 1 | -2/+2 |
|/ | | | | not "ActiveRecord" | ||||
* | Fix multiple self-referencing eager loads failing to join multiple times | Ernie Miller | 2010-06-08 | 1 | -2/+2 |
| | | | | | | [#4679 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Merge remote branch 'rsim/oracle_enhanced_rails3' | wycats | 2010-06-07 | 1 | -1/+2 |
|\ | |||||
| * | Downcase quoted table name in regex in count_aliases_from_table_joins | Raimonds Simanovskis | 2010-06-04 | 1 | -1/+2 |
| | | | | | | | | Oracle adapter's quote_table_name returns quoted table name in uppercase and therefore it should be downcased before scanning downcased join_sql | ||||
* | | Require active support/string/conversions so constantize can be used in ↵ | Tom Meier | 2010-06-07 | 1 | -0/+1 |
|/ | | | | | | associations.rb Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | refactor evals and adds some __FILE__ and __LINE__ | Santiago Pastorino | 2010-05-20 | 1 | -2/+2 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Merge branch 'master' of git://github.com/rails/rails | Rizwan Reza | 2010-05-17 | 1 | -1/+1 |
|\ | |||||
| * | Fix for get_ids when including a belongs_to association on a has_many ↵ | Diego Algorta | 2010-05-15 | 1 | -1/+1 |
| | | | | | | | | | | | | association [#2896 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | | better documentation for dependent option [#4564 state:resolved] | Neeraj Singh | 2010-05-16 | 1 | -4/+5 |
|/ | |||||
* | eliminate alias_method_chain from ActiveRecord | wycats | 2010-05-09 | 1 | -8/+8 |
| | |||||
* | Fix eager loading of associations causing table name collisions | Ernie Miller | 2010-04-28 | 1 | -17/+60 |
| | | | | | | [#4463 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Destroy respects optimistic locking. | Curtis Hawthorne | 2010-04-27 | 1 | -1/+10 |
| | | | | | | | | | | Now works with :dependent => :destroy and includes unit tests for that case. Also includes better error messages when updating/deleting stale objects. [#1966 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Avoid deprecated String#to_a by using Array.wrap(...) instead of Array(...) | Jeremy Kemper | 2010-04-10 | 1 | -3/+4 |
| | |||||
* | Bring back +extra_conditions+. This effectively reverts ↵ | Carl Lerche | 2010-04-03 | 1 | -3/+3 |
| | | | | 386b7bfd9d78a6d8c8bc7cc4a310df806ad0ba57 | ||||
* | Make the query built by has_many ...., :dependent => :____ lazy since all ↵ | Carl Lerche | 2010-04-02 | 1 | -50/+22 |
| | | | | the information is not really available yet. | ||||
* | Remove an unused argument | Carl Lerche | 2010-04-02 | 1 | -2/+1 |
| | |||||
* | Fix honoring :primary_key option when joining or eager loading a belongs_to ↵ | Ernie Miller | 2010-03-29 | 1 | -1/+1 |
| | | | | | | | | association [#765 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Add :dependent = to has_one and has_many [#3075 state:resolved] | Rizwan Reza | 2010-03-28 | 1 | -2/+37 |
| | |||||
* | adds missing requires for Object#blank? and Object#present? | Xavier Noria | 2010-03-28 | 1 | -0/+1 |
| |