aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | remove unwanted require for string encodingVishnu Atrai2012-02-132-2/+0
* | | Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepareAaron Patterson2012-02-131-1/+1
|\ \ \
| * | | fixes rake db:test:prepare when using postgresql with sql db structure file a...Sean Kirby2012-02-011-1/+1
* | | | Merge pull request #5000 from flavorpill/master-with-multidb-association-fixAaron Patterson2012-02-1311-10/+40
|\ \ \ \ | |_|/ / |/| | |
| * | | fix associations when using per class databasesLars Kanis2012-02-103-8/+5
| * | | added test for #3732Rick Martinez2012-02-108-2/+35
* | | | Merge pull request #5012 from waseem/alias-reconnect-mysql2Aaron Patterson2012-02-131-5/+1
|\ \ \ \
| * | | | Alias reconnect! to reset! for Mysql2 adapter since they have sameWaseem Ahmad2012-02-121-5/+1
* | | | | Merge pull request #5018 from hammerdr/issue-4659-docsAaron Patterson2012-02-131-4/+7
|\ \ \ \ \
| * | | | | Missed a code example. Fixing the docs to be consistant.Derek Hammer2012-02-121-1/+1
| * | | | | Adding documentation to clarify usage of attributes hash.Derek Hammer2012-02-121-3/+6
* | | | | | Merge pull request #5024 from carlosantoniodasilva/amo-serializable-hash-stri...José Valim2012-02-132-46/+45
|\ \ \ \ \ \
| * | | | | | Make sure serializable hash with :methods option returns always string keysCarlos Antonio da Silva2012-02-132-4/+4
| * | | | | | Cleanup extra spacesCarlos Antonio da Silva2012-02-131-45/+44
|/ / / / / /
* | | | | | Merge pull request #5016 from exviva/form_helper_date_fieldsJosé Valim2012-02-129-5/+82
|\ \ \ \ \ \
| * | | | | | Add HTML5 input[type="date"] helperOlek Janiszewski2012-02-129-5/+82
* | | | | | | Merge pull request #5021 from tchandy/clean_controller_testsJosé Valim2012-02-123-39/+0
|\ \ \ \ \ \ \
| * | | | | | | Removing old Controller testThiago Pradi2012-02-123-39/+0
| | |/ / / / / | |/| | | | |
* | | | | | | prefer tr to gsub for replacing charactersXavier Noria2012-02-121-2/+2
* | | | | | | inflection regexp are meant to be applied onceXavier Noria2012-02-121-2/+2
* | | | | | | removes redundant argumentXavier Noria2012-02-121-1/+1
* | | | | | | boosts inflectionsXavier Noria2012-02-121-1/+1
|/ / / / / /
* | | | | | Merge pull request #5015 from castlerock/revert_PR_5001_fix_isolated_test_runJosé Valim2012-02-124-0/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Revert PR#5001 "removed unuseful require for reply as we are not using requir...Vishnu Atrai2012-02-124-0/+5
|/ / / / /
* | | | | Merge pull request #5014 from castlerock/fix_build_PR_5001Xavier Noria2012-02-121-0/+1
|\ \ \ \ \
| * | | | | fix build 5001, model reply is required in cases/primary_keys_test too!Vishnu Atrai2012-02-121-0/+1
|/ / / / /
* | | | | Merge pull request #5013 from castlerock/fix_build_pull_5001José Valim2012-02-121-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | fix build #5001 reply model required in relations_testVishnu Atrai2012-02-121-0/+1
|/ / / /
* | | | Merge pull request #5010 from tchandy/clean_routing_testsJosé Valim2012-02-112-58/+2
|\ \ \ \
| * | | | Cleaning Route generation testsThiago Pradi2012-02-122-58/+2
|/ / / /
* | | | Merge pull request #5006 from lest/patch-1Xavier Noria2012-02-112-1/+7
|\ \ \ \
| * | | | handle id attribute in PrimaryKey moduleSergey Nartimov2012-02-112-1/+7
|/ / / /
* | | | Merge pull request #5003 from kennyj/fix_warning_20120211Santiago Pastorino2012-02-111-1/+1
|\ \ \ \
| * | | | Fix warning: The method name is a duplicate and wrong.kennyj2012-02-111-1/+1
* | | | | Merge pull request #5001 from Karunakar/no_reply_requiresXavier Noria2012-02-116-7/+0
|\ \ \ \ \
| * | | | | removed unuseful require for reply as we are not using require modelKarunakar (Ruby)2012-02-116-7/+0
|/ / / / /
* / / / / say unshift when you mean unshift (modulus prepend)Xavier Noria2012-02-112-4/+8
|/ / / /
* | | | say goodbye to #with_test_routes :axe:Xavier Noria2012-02-101-1166/+947
* | | | fixes a regression introduced by 532cd4, and a bogus test in AP the regressio...Xavier Noria2012-02-103-8/+10
* | | | Merge branch 'master' into instance_readerAaron Patterson2012-02-102-6/+15
|\| | |
| * | | Merge pull request #4719 from markmcspadden/singularize_words_that_end_in_ssXavier Noria2012-02-102-6/+15
| |\ \ \
| | * | | Add Inflection test (and fixes) to ensure singularizing a singular actually g...Mark McSpadden2012-01-272-6/+15
* | | | | PG column consults oid types when typecastingAaron Patterson2012-02-105-10/+34
* | | | | dynamically populate casting objects via the pg_type tableAaron Patterson2012-02-102-35/+74
* | | | | Merge branch 'joelhoffman-postgres_schema_builder' into instance_readerAaron Patterson2012-02-106-36/+126
|\ \ \ \ \
| * | | | | Also support writing the hstore back to the databaseJoel2012-02-082-0/+13
| * | | | | Hstore values are all stringsJoel2012-02-081-1/+1
| * | | | | string_to_hstore / hstore_to_string, serializingJoel2012-02-083-17/+26
| * | | | | don't test schema where hstore not installedJoel2012-02-081-0/+2
| * | | | | schema dumper tests for hstoreJoel2012-02-082-1/+15