aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* join any extra args to the tmp pathAaron Patterson2012-06-191-0/+1
* expand the tmpdir to the realpath so tests on OS X passAaron Patterson2012-06-192-2/+2
* Merge branch 'remote'Aaron Patterson2012-06-192-33/+22
|\
| * move fanout back to a global variable, add a mutex for safetyAaron Patterson2012-06-192-33/+22
* | use system tmpdir rather than our ownAaron Patterson2012-06-193-13/+26
* | make logger a singleton on the classAaron Patterson2012-06-191-3/+7
* | listeners are per thread, so remove nested hashAaron Patterson2012-06-191-6/+4
|/
* Add missing requireRafael Mendonça França2012-06-191-0/+2
* Merge pull request #6782 from kennyj/db-rake-structure-dumpRafael Mendonça França2012-06-199-14/+147
|\
| * Refactor db:structure:dump task.kennyj2012-06-209-14/+147
* | Merge pull request #6784 from msgehard/active_support_cleanupCarlos Antonio da Silva2012-06-191-7/+4
|\ \
| * | Remove extra test case.Mike Gehard2012-06-191-7/+4
| |/
* | subscribers are per thread, so remove the nested hash accessAaron Patterson2012-06-191-5/+3
* | documenting concurrency rules for the Fanout classAaron Patterson2012-06-191-0/+3
* | remove global cacheAaron Patterson2012-06-191-7/+2
* | reduce thread localsAaron Patterson2012-06-191-3/+20
* | make the fanout notifier local to the current threadAaron Patterson2012-06-191-4/+8
* | Merge pull request #6785 from kennyj/rename_testcase_nameCarlos Antonio da Silva2012-06-191-1/+1
|\ \
| * | Rename testcase name. It's wrong in the context.kennyj2012-06-201-1/+1
| |/
* | Merge pull request #6783 from kennyj/rename_testnameRafael Mendonça França2012-06-191-1/+1
|\ \ | |/ |/|
| * Rename MySQLTestPurge to MySQLPurgeTest for consistency.kennyj2012-06-201-1/+1
|/
* Merge pull request #6779 from simonjefford/db-rake-charsetCarlos Antonio da Silva2012-06-199-20/+118
|\
| * Refactor db:charset taskSimon Jefford2012-06-199-20/+118
|/
* Merge pull request #6777 from route/logger_in_metal_testsCarlos Antonio da Silva2012-06-191-0/+17
|\
| * Added test for case when view doesn't have logger method when using ActionCon...Dmitry Vorotilin2012-06-191-0/+17
* | Merge pull request #6776 from raggi/cache_controlJosé Valim2012-06-182-10/+44
|\ \ | |/ |/|
| * Ensure that cache-control headers are mergedJames Tucker2012-06-182-10/+44
* | Merge branch 'acapilleri-update_nested_attributes'Rafael Mendonça França2012-06-192-5/+25
|\ \
| * | Refactor the conditionalsRafael Mendonça França2012-06-191-7/+7
| * | Validates_numericality_of is skipped when changing 0 to to non-empty stringAngelo capilleri2012-06-192-5/+25
|/ /
* | Merge pull request #5412 from tilsammans/stored_attributesCarlos Antonio da Silva2012-06-183-2/+32
|\ \
| * | Refactor and use class_attributeCarlos Antonio da Silva2012-06-182-7/+15
| * | Remember the stored attributes in a config attribute.Joost Baaij2012-06-183-1/+23
|/ /
* | Improve the CHANGELOG entry [ci skip]Rafael Mendonça França2012-06-181-2/+19
* | Merge branch 'hash_with_indifferent_access_fix'Carlos Antonio da Silva2012-06-182-1/+9
|\ \
| * | Use map! instead of replace + mapCarlos Antonio da Silva2012-06-181-1/+1
| * | Fix lookup on HashWithIndifferentAccess for array values.Chris Zetter2012-06-182-1/+9
|/ /
* | Refactor Relation#update a bit to avoid an extra Enumerator instanceCarlos Antonio da Silva2012-06-181-1/+1
* | Make DatabaseTasks a module with real private methodsCarlos Antonio da Silva2012-06-181-13/+14
* | Merge pull request #6775 from takoyakikamen/eventsAaron Patterson2012-06-183-11/+42
|\ \ | |/ |/|
| * make events not use date and time to determine parent_of. fixes #5932タコ焼き仮面2012-06-183-11/+42
|/
* Add CHANGELOG entry to composed_of removalRafael Mendonça França2012-06-181-0/+6
* Merge pull request #6743 from steveklabnik/remove_composed_ofRafael Mendonça França2012-06-1818-768/+9
|\
| * Removing composed_of from ActiveRecord.Steve Klabnik2012-06-1818-768/+9
* | Merge pull request #6772 from yahonda/reset_sequence_name_oracleRafael Mendonça França2012-06-181-0/+2
|\ \ | |/ |/|
| * Add ensure Joke.reset_sequence_nameYasuo Honda2012-06-191-0/+2
|/
* Merge branch 'eliminate_notice_messages'Carlos Antonio da Silva2012-06-185-5/+15
|\
| * Change minimum (default) log level in PostgreSQL to warning.kennyj2012-06-185-5/+15
|/
* Require thor 0.15.3 onwardsJosé Valim2012-06-182-5/+2
* Merge branch 'dp_docs'Carlos Antonio da Silva2012-06-181-0/+92
|\