aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* 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
* Merge pull request #6827 from zephyr-dev/masterJosé Valim2012-07-274-0/+116
|\
| * AR has a subclass of AM:PresenceValidator.Brent Wheeldon & Nick Monje2012-07-204-0/+116
* | Changelog and doc updates for the previous changes.Jon Leighton2012-07-272-9/+27
* | Deprecate Relation#all.Jon Leighton2012-07-276-22/+9
* | Deprecate ActiveRecord::Base.scoped.Jon Leighton2012-07-2742-504/+497
* | ActiveRecord::Base.all returns a Relation.Jon Leighton2012-07-2730-323/+328
* | Only require the `:rails_env` task where is needed.Rafael Mendonça França2012-07-271-12/+12
* | Modify the preference attribute from `:null => false` to `:null => true`Yasuo Honda2012-07-271-1/+1
* | Refactor ActiveRecord::Inheritance.base_class logicbeerlington2012-07-263-30/+45
* | Missed extend for eager_autoloadDmitry Vorotilin2012-07-261-0/+1
* | Merge pull request #7166 from ayrton/patch-1Jon Leighton2012-07-261-13/+13
|\ \
| * | Update activerecord/CHANGELOG.mdAyrton De Craene2012-07-261-13/+13
* | | Merge pull request #7161 from michaelfairley/eager_load_active_record_associa...Jon Leighton2012-07-261-5/+7
|\ \ \ | |/ / |/| |
| * | Eager autoload ActiveRecord association helpersMichael Fairley2012-07-251-5/+7
* | | Switched update_column recommendation in changelog to update_columnsPhilip Arndt2012-07-261-1/+1
* | | Merge pull request #6654 from stevecj/postgresql-auto-reconnect-2Aaron Patterson2012-07-253-1/+76
|\ \ \
| * | | Stop being silly with formatting of method aliasing.Steve Jorgensen2012-07-161-3/+3
| * | | Simulated & actual (manual/skipped) PostgreSQL auto-reconnection tests.Steve Jorgensen2012-07-163-0/+75
| * | | Don't crash exception translation w/ nil result attribute.Steve Jorgensen2012-07-161-1/+1
* | | | Use string datatype for the setting attributeYasuo Honda2012-07-261-1/+1
* | | | Deprecate update_column in favor of update_columns.Rafael Mendonça França2012-07-2415-47/+85
* | | | Use update_columns to implemente the update_columnRafael Mendonça França2012-07-242-19/+54
* | | | New #update_columns method.Sebastian Martinez2012-07-242-0/+74
* | | | This pull requests addresses ORA-01400 errors and also supports #6115 issue t...Yasuo Honda2012-07-251-1/+1
* | | | Restore connection_id on error.kennyj2012-07-232-4/+22
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-07-217-27/+108
|\ \ \ \
| * | | | improve NullRelation docs [ci skip]Vijay Dev2012-07-212-5/+4
| * | | | minor copy edits [ci skip]Vijay Dev2012-07-212-4/+2
| * | | | Fix typosOscar Del Ben2012-07-191-3/+3
| * | | | Add nodocs to delegation module and docs for merge!Oscar Del Ben2012-07-172-1/+2
| * | | | Update batches docsOscar Del Ben2012-07-171-6/+6
| * | | | Add nodoc to HashMerger and MergerOscar Del Ben2012-07-171-2/+2
| * | | | Fix typos and add nodocs to NullRelationOscar Del Ben2012-07-172-4/+4
| * | | | Improve docs for AR RelationOscar Del Ben2012-07-171-7/+19
| * | | | Add docs for Relation initialize, create and create!Oscar Del Ben2012-07-161-1/+34
| * | | | Don't link to edgeguides in docsOscar Del Ben2012-07-161-1/+1