aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | properly handle lists of lists. Thanks @adrianpike for reporting!Aaron Patterson2011-10-252-1/+15
* | | Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2011-10-2594-392/+1575
|\ \ \
| * \ \ Merge pull request #3357 from rahul100885/rahul100885_wsVijay Dev2011-10-251-0/+10
| |\ \ \
| | * | | Added test case for postgresql databaseRahul P. Chaudhari2011-10-181-0/+10
| * | | | Clean up .gitignore and make a note about using global ignoresJeremy Kemper2011-10-251-25/+22
| * | | | Revert "Ignore .rbx directories (rbx compiled bytecode files)"José Valim2011-10-251-1/+0
| * | | | Revert "Merge pull request #3395 from bdurand/fix_file_store_cleanup"José Valim2011-10-253-57/+4
| * | | | Merge pull request #3422 from arunagw/unused_var_warningVijay Dev2011-10-251-1/+1
| |\ \ \ \
| | * | | | Unused variable removedArun Agrawal2011-10-241-1/+1
| * | | | | safeguard against configs missing environment or the database keyVijay Dev2011-10-261-1/+1
| | |_|/ / | |/| | |
| * | | | Merge pull request #3424 from avakhov/av-scaffold-func-test-remove-to_paramJosé Valim2011-10-241-4/+4
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Remove needless to_param in scaffold functional testAlexey Vakhov2011-10-241-4/+4
| |/ / /
| * | | minor revision to some new code in databases.rakeXavier Noria2011-10-241-2/+3
| * | | registers PR #2419 in the CHANGELOGXavier Noria2011-10-241-0/+3
| * | | Merge pull request #2419 from dmitriy-kiriyenko/drop_test_database_in_develop...Xavier Noria2011-10-241-11/+15
| |\ \ \
| | * | | When running "rake db:drop" also drop test database in development environment.Dmitriy Kiriyenko2011-09-291-11/+15
| * | | | Merge pull request #3416 from arunagw/rbx_test_fixesJosé Valim2011-10-242-2/+9
| |\ \ \ \
| | * | | | ActionPack test fix for RBXArun Agrawal2011-10-242-2/+9
| |/ / / /
| * | | / Ignore .rbx directories (rbx compiled bytecode files)Jon Leighton2011-10-231-0/+1
| | |_|/ | |/| |
| * | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-10-234-20/+15
| |\ \ \
| | * | | edge doesnt provide turn gem in the gemfile anymoreVijay Dev2011-10-231-5/+0
| | * | | Updated rack version in docs for 3.2Arun Agrawal2011-10-221-1/+1
| | * | | Rails version to 3.2.0.beta in docsArun Agrawal2011-10-221-6/+6
| | * | | Middleware details updated for 3.2Arun Agrawal2011-10-221-1/+1
| | * | | Add some note on adding index to HABTM tablePrem Sichanugrist2011-10-201-0/+4
| | * | | Use new migration style in HABTM join tablePrem Sichanugrist2011-10-201-5/+1
| | * | | Fixed typo.Pepe Hipolito2011-10-201-1/+1
| | * | | Fixed typo.Pepe Hipolito2011-10-201-1/+1
| * | | | Merge pull request #3352 from arunagw/bump_sprocketsVijay Dev2011-10-221-1/+1
| |\ \ \ \
| | * | | | Bump sprocketsArun Agrawal2011-10-171-1/+1
| * | | | | Merge pull request #3408 from guilleiguaran/remove-turnJosé Valim2011-10-223-28/+0
| |\ \ \ \ \
| | * | | | | Remove Turn from default Gemfile.Guillermo Iguaran2011-10-223-28/+0
| * | | | | | Revert "Merge pull request #3405 from arunagw/middleware_name"Aaron Patterson2011-10-221-1/+1
| |/ / / / /
| * | | | | Merge pull request #3405 from arunagw/middleware_nameAaron Patterson2011-10-221-1/+1
| |\ \ \ \ \
| | * | | | | Using middleware name to show proper name in the infoArun Agrawal2011-10-221-1/+1
| * | | | | | minor fixes in the composed_of docVijay Dev2011-10-221-3/+4
| * | | | | | Merge pull request #3407 from arunagw/rake_upgradeXavier Noria2011-10-221-6/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | No need to check ruby version here Arun Agrawal2011-10-221-6/+1
| |/ / / / /
| * | | | | Merge pull request #3404 from arunagw/warning_removed_request_idJosé Valim2011-10-221-2/+2
| |\ \ \ \ \
| | * | | | | Warnings removed from RequestIdTestArun Agrawal2011-10-221-2/+2
| |/ / / / /
| * | | | | Merge pull request #3396 from bdurand/session_cache_storeJosé Valim2011-10-216-8/+243
| |\ \ \ \ \
| | * | | | | Add ActionDispatch::Session::CacheStore as a generic way of storing sessions ...Brian Durand2011-10-216-8/+243
| * | | | | | Merge pull request #3400 from greinacker/sqlite-decimalAaron Patterson2011-10-212-0/+39
| |\ \ \ \ \ \
| | * | | | | | preserve decimal column attributes after migrationGreg Reinacker2011-10-212-0/+39
| |/ / / / / /
| * | | | | | Merge pull request #3395 from bdurand/fix_file_store_cleanupJosé Valim2011-10-213-4/+57
| |\ \ \ \ \ \
| | * | | | | | Fix ActiveSupport::Cache::FileStore.cleanup to actually work.Brian Durand2011-10-213-4/+57
| | |/ / / / /
| * | | | | | Merge pull request #3394 from bdurand/buffered_logger_threadsJosé Valim2011-10-212-8/+89
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Fix threading issues with BufferedLogger.Brian Durand2011-10-212-8/+89
| |/ / / / /
| * | | | | Merge pull request #3387 from arunagw/tagged_log_nilJosé Valim2011-10-212-1/+7
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Checking blank if tag might coming nil or blankArun Agrawal2011-10-212-1/+7
| |/ / / /