aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* splited a long line to shorter onesSergey Parizhskiy2011-11-291-1/+8
* Merge pull request #3790 from masterkain/patch-1Vijay Dev2011-11-291-1/+1
|\
| * Fix typo in AS::TaggedLoggingClaudio Poli2011-11-291-1/+1
* | Merge pull request #3793 from marcandre/asset_hostJosé Valim2011-11-282-2/+10
|\ \ | |/ |/|
| * Handle correctly optional parameters for callable asset_host.Marc-Andre Lafortune2011-11-292-2/+10
|/
* remove unused instance variableAaron Patterson2011-11-281-1/+0
* just check in all connectionsAaron Patterson2011-11-281-6/+2
* remove useless class_evalAaron Patterson2011-11-281-2/+0
* Move connection resoluion logic to it's own testable class.Aaron Patterson2011-11-283-92/+115
* clean up string => hash conversion for connection poolAaron Patterson2011-11-281-19/+17
* pools are 1:1 with spec now rather than 1:1 with classAaron Patterson2011-11-284-7/+8
* break establish_connection to smaller methodsAaron Patterson2011-11-282-33/+43
* added information about callbacks created by autosave association (#3639)Jakub Kuźma2011-11-281-4/+16
* Merge pull request #3768 from janv/masterAaron Patterson2011-11-282-1/+12
|\
| * Test case and fix for rails/rails#3450Jan Varwig2011-11-272-1/+12
* | Merge pull request #3785 from lest/backtrace-cleaner-envJosé Valim2011-11-284-18/+27
|\ \
| * | put backtrace_cleaner to envlest2011-11-284-18/+27
|/ /
* | Merge pull request #3783 from HeeL/masterVijay Dev2011-11-281-1/+1
|\ \
| * | fixed a typo in a message when there is no failuresin a buildSergey Parizhskiy2011-11-281-1/+1
|/ /
* | Merge pull request #3278 from arunagw/rails_rake_task_warningJosé Valim2011-11-281-0/+1
|\ \
| * | global variable `$rails_rake_task' not initialized Warning removedArun Agrawal2011-11-281-0/+1
|/ /
* | Merge pull request #3657 from arunagw/mysql2_bump_masterJosé Valim2011-11-282-2/+2
|\ \
| * | Bump Mysql2!Arun Agrawal2011-11-222-2/+2
* | | Revert "use any? to check for size"Vijay Dev2011-11-281-1/+1
* | | Revert "Use any instead of length"José Valim2011-11-281-1/+1
* | | Revert "Used any? instead of length call"Xavier Noria2011-11-282-2/+2
* | | Merge pull request #3776 from nashby/add-namespace-to-formJosé Valim2011-11-273-2/+95
|\ \ \
| * | | update CHANGELOGVasiliy Ermolovich2011-11-281-0/+10
| * | | add namespace options to form_forVasiliy Ermolovich2011-11-272-2/+85
* | | | Merge pull request #3779 from rahul100885/rahul100885_workJosé Valim2011-11-272-2/+2
|\ \ \ \
| * | | | Used any? instead of length callRahul P. Chaudhari2011-11-282-2/+2
|/ / / /
* | | | Merge pull request #3748 from samsonasu/has_many_custom_pk_new_recordJon Leighton2011-11-273-2/+33
|\ \ \ \
| * | | | load has_many associations keyed off a custom primary key if that key is pres...Brian Samson2011-11-253-2/+33
* | | | | Merge pull request #3773 from rahul100885/rahul100885_workSantiago Pastorino2011-11-271-1/+1
|\ \ \ \ \
| * | | | | Use any instead of lengthRahul P. Chaudhari2011-11-271-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge pull request #3771 from kennyj/fix_rake_test_warningsJosé Valim2011-11-271-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Call a block passed rake_tasks method in the self contextkennyj2011-11-271-1/+1
| |/ / /
* | | | Merge pull request #3769 from kennyj/fix_index_htmlJosé Valim2011-11-272-1/+2
|\ \ \ \
| * | | | avoid absolute path for the rails.png in index.htmlkennyj2011-11-272-1/+2
| |/ / /
* | | | Merge pull request #3772 from lest/label-with-blockJosé Valim2011-11-273-2/+13
|\ \ \ \ | |/ / / |/| | |
| * | | fix label with block in erblest2011-11-273-2/+13
|/ / /
* | | Merge pull request #3767 from tadast/object_inYehuda Katz2011-11-262-7/+27
|\ \ \
| * | | Object#in? also accepts multiple parametersTadas Tamošauskas2011-11-262-7/+27
* | | | Merge pull request #3765 from qoobaa/orm-instance-fixJosé Valim2011-11-262-1/+39
|\ \ \ \
| * | | | added tests, replaced classify with constantize - using classify here cuts th...Jakub Kuźma2011-11-262-1/+39
* | | | | Merge pull request #3763 from qoobaa/orm-instance-fixJosé Valim2011-11-261-1/+1
|\| | | |
| * | | | allow using orm_instance without invoking orm_class first in generatorsJakub Kuźma2011-11-261-1/+1
* | | | | add more tests for monday and sunday methodsVijay Dev2011-11-261-0/+2
* | | | | Merge pull request #3764 from arunagw/test_sunday_mondayVijay Dev2011-11-261-0/+8
|\ \ \ \ \
| * | | | | Tests added for monday and sunday Arun Agrawal2011-11-261-0/+8