aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-08-042-44/+64
|\
| * Revert "Fix string interpolation in belongs_to docs"Vijay Dev2012-08-041-1/+1
| * Fix string interpolation in belongs_to docsFranco Catena2012-08-011-1/+1
| * fix ActiveRecord::Associations::CollectionProxy documentationAccessd2012-07-311-1/+1
| * update AR::Validations::AssociatedValidator documentation [ci skip]Francesco Rodriguez2012-07-291-13/+19
| * update AR::Validations::UniquenessValidator documentation [ci skip]Francesco Rodriguez2012-07-291-31/+45
| * Revert "Removed reference to composed_of."Rafael Mendonça França2012-07-271-0/+3
| * Removed reference to composed_of.Steve Klabnik2012-07-231-3/+0
* | Update Migration Docs: Defaults for Boolean FieldsThomas Klemm2012-08-041-1/+1
* | Make ActiveRecord::Model::DeprecationProxy work betterJon Leighton2012-08-033-22/+55
* | Update the docs to reflect the new association APIJon Leighton2012-08-031-190/+80
* | Don't eager load all thisSantiago Pastorino2012-08-031-32/+33
* | Remove ActiveRecord::Base.to_aJon Leighton2012-08-0317-63/+54
* | reinstate changelog that seems to have been accidentally deleted o_OJon Leighton2012-08-031-0/+19
* | Allow Relation#merge to take a proc.Jon Leighton2012-08-033-2/+37
* | Remove `:rails_env` task since it is not needed anymore.Rafael Mendonça França2012-08-021-9/+9
* | load active_support/deprecation in active_support/railsXavier Noria2012-08-0216-16/+1
* | load active_support/core_ext/module/delegation in active_support/railsXavier Noria2012-08-028-8/+0
* | load active_support/core_ext/class/attribute in active_support/railsXavier Noria2012-08-0212-12/+0
* | load active_support/concern in active_support/railsXavier Noria2012-08-0211-11/+0
* | load active_support/core_ext/object/inclusion in active_support/railsXavier Noria2012-08-0212-12/+0
* | load active_support/core_ext/object/blank in active_support/railsXavier Noria2012-08-0220-20/+0
* | defines a private require-hub active_support/railsXavier Noria2012-08-021-0/+1
* | Do not consider the numeric attribute as changed if the old value isRafael Mendonça França2012-08-022-2/+15
* | s/scoped/scope/Jon Leighton2012-08-019-27/+33
* | Add CollectionProxy#scopeJon Leighton2012-08-013-1/+30
* | Use explicit delegationsJon Leighton2012-08-011-119/+79
* | Refactor a bitJon Leighton2012-08-011-38/+37
* | Add `Relation#load`Jon Leighton2012-08-013-2/+35
* | Deprecate :finder_sql, :counter_sql, :insert_sql, :delete_sql.Jon Leighton2012-08-019-45/+118
* | Revert "Remove :finder_sql, :counter_sql, :insert_sql, :delete_sql."Jon Leighton2012-08-0115-84/+339
* | Change AR's CHANGELOG, because it is related to e35c67ae0f920011a2440210041e9...kennyj2012-08-021-1/+1
* | Merge pull request #7224 from kennyj/move_to_arJosé Valim2012-08-011-15/+21
|\ \
| * | The use_schema_cache_dump configuration moved to ActiveRecord.kennyj2012-08-021-15/+21
* | | Refactor dependency check validationCarlos Antonio da Silva2012-08-014-28/+19
* | | move method for dependent option checkHrvoje Šimić2012-08-014-11/+22
|/ /
* | fix typo in collection proxyAccessd2012-07-311-1/+1
* | AR::Relation#order: make new order prepend old oneBogdan Gusiev2012-07-317-16/+25
* | Remove the deprecation of update_column.Rafael Mendonça França2012-07-303-48/+18
* | Merge pull request #7196 from rimidl/fix-incorrect-require-mysql-in-mysql_rak...Aaron Patterson2012-07-291-1/+5
|\ \
| * | fix incorrect usage `require mysql` in the activerecord/test/.../mysql_rake_t...Vladimir Strakhov2012-07-291-1/+5
* | | Merge pull request #7188 from rodrigoflores/masterCarlos Antonio da Silva2012-07-291-1/+2
|\ \ \
| * | | Explaining a bit better about the default behaviour of dependentRodrigo Flores2012-07-281-1/+2
| |/ /
* / / More polite cleanup for sqlite testsBogdan Gusiev2012-07-291-4/+4
|/ /
* | removes the AR session store from eager loaded code [fixes #7160]Xavier Noria2012-07-291-1/+10
* | Merge pull request #7185 from route/reset_table_name_refactoringRafael Mendonça França2012-07-281-8/+4
|\ \
| * | Refactor to reset_table_nameDmitry Vorotilin2012-07-281-8/+4
* | | missing require: the AR session store depends on the AP abstract storeXavier Noria2012-07-281-0/+2
|/ /
* | Revert "Removing composed_of from ActiveRecord."Rafael Mendonça França2012-07-2719-32/+790
* | Modity the :json_data_empty attribute from `:null => false` to `:null => true`Yasuo Honda2012-07-281-1/+1