aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* removes the AR session store from eager loaded code [fixes #7160]Xavier Noria2012-07-291-1/+10
* Merge pull request #7186 from rimidl/fix-failure-test-in-actionpackRafael Mendonça França2012-07-281-2/+2
|\
| * fix failure test 'test_can_wait_until_commit(ResponseTest)' in actionpackVladimir Strakhov2012-07-281-2/+2
* | 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
|/
* adds a missing require from Active SupportXavier Noria2012-07-281-0/+1
* threads can wait on responses to be committedAaron Patterson2012-07-273-1/+34
* Revert "Removing composed_of from ActiveRecord."Rafael Mendonça França2012-07-2719-32/+790
* Merge pull request #7182 from yahonda/address_7178Rafael Mendonça França2012-07-271-1/+1
|\
| * Modity the :json_data_empty attribute from `:null => false` to `:null => true`Yasuo Honda2012-07-281-1/+1
* | Merge pull request #7181 from jfirebaugh/rbxRafael Mendonça França2012-07-271-5/+1
|\ \ | |/ |/|
| * Don't test language-level exception messagesJohn Firebaugh2012-07-271-5/+1
|/
* Merge pull request #6827 from zephyr-dev/masterJosé Valim2012-07-275-0/+118
|\
| * AR has a subclass of AM:PresenceValidator.Brent Wheeldon & Nick Monje2012-07-205-0/+118
* | Add Object#try! with the old NoMethodError raising behaviorDavid Heinemeier Hansson2012-07-273-2/+40
* | will now return nil instead of raise a NoMethodError if the receiving object...David Heinemeier Hansson2012-07-273-5/+10
* | Changelog and doc updates for the previous changes.Jon Leighton2012-07-273-24/+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-2731-324/+329
* | Only require the `:rails_env` task where is needed.Rafael Mendonça França2012-07-271-12/+12
* | Merge pull request #7173 from yahonda/address_7138Rafael Mendonça França2012-07-261-1/+1
|\ \
| * | Modify the preference attribute from `:null => false` to `:null => true`Yasuo Honda2012-07-271-1/+1
|/ /
* | * Do not convert digest auth strings to symbols. CVE-2012-3424Aaron Patterson2012-07-261-2/+2
* | Merge pull request #7171 from beerlington/refactor_inheritance_base_classRafael Mendonça França2012-07-263-30/+45
|\ \
| * | Refactor ActiveRecord::Inheritance.base_class logicbeerlington2012-07-263-30/+45
* | | Merge pull request #7170 from makaroni4/masterRafael Mendonça França2012-07-262-2/+2
|\ \ \ | |/ / |/| |
| * | fix typo in documentationAnatoly Makarevich2012-07-262-2/+2
|/ /
* | Merge pull request #7167 from route/missed_extendJosé Valim2012-07-261-0/+1
|\ \
| * | 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
* | | Merge pull request #7165 from parndt/patch-5Rafael Mendonça França2012-07-251-1/+1
|\ \ \
| * | | 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
* | | | Merge pull request #7158 from yahonda/use_string_for_settingsRafael Mendonça França2012-07-251-1/+1
|\ \ \ \
| * | | | Use string datatype for the setting attributeYasuo Honda2012-07-261-1/+1
|/ / / /
* | | | Merge pull request #7151 from graceliu/travis-rm-dup-runCarlos Antonio da Silva2012-07-241-3/+0
|\ \ \ \
| * | | | remove duplicate build runs in travis. These extra runs were used toGrace Liu2012-07-241-3/+0
|/ / / /
* | | | Merge branch 'update_columns'Rafael Mendonça França2012-07-2416-63/+212
|\ \ \ \
| * | | | 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-243-0/+76
|/ / / /
* | | | Merge pull request #7148 from yahonda/address_6195Rafael Mendonça França2012-07-241-1/+1
|\ \ \ \