aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3462 from kennyj/remove_deprecated_codeJosé Valim2011-10-291-2/+0
|\ | | | | removed a reference to SynchronizedMemoryStore and CompressedMemCacheStore
| * removed reference to SynchronizedMemoryStore and CompressedMemCacheStore ↵kennyj2011-10-301-2/+0
|/ | | | (the remaining code from 9cafc28874)
* Merge pull request #3337 from htanata/fix_rake_routes_for_controller_only_routeJosé Valim2011-10-292-9/+18
|\ | | | | Remove trailing "#" on rake routes for controller only routes
| * On inpsect routes, show :controller and :action to indicate dynamic.Hendy Tanata2011-10-292-9/+18
| |
* | Merge pull request #3460 from arunagw/method_redefine_warning_removedXavier Noria2011-10-291-0/+1
|\ \ | | | | | | method redefined warning removed!
| * | method redefined warning removed!Arun Agrawal2011-10-291-0/+1
|/ /
* | Merge pull request #3459 from arunagw/running_test_doc_fixVijay Dev2011-10-291-1/+1
|\ \ | | | | | | ActiveRecord is no more in controller directory.
| * | ActiveRecord is no more in controller directory.Arun Agrawal2011-10-291-1/+1
| | |
* | | let demodulize do less work, and add testsXavier Noria2011-10-292-1/+5
|/ / | | | | | | This is also faster on 1.9.
* | Merge pull request #3456 from pwim/documentation-fixJosé Valim2011-10-271-1/+1
|\ \ | | | | | | Add missing type to number_field_tag documentation
| * | Add missing type to number_field_tag documentationPaul McMahon2011-10-281-1/+1
|/ /
* | clear statement cache when tables are alteredAaron Patterson2011-10-271-0/+6
| |
* | Added failing test case for changing schema in migration not clearing the ↵Joe Van Dyk2011-10-271-0/+12
|/ | | | prepared statement cache
* Merge pull request #3449 from arunagw/checks_for_instance_writersJosé Valim2011-10-271-1/+2
|\ | | | | More checks for instance writers.
| * More checks for instance writers.Arun Agrawal2011-10-271-1/+2
|/
* Merge pull request #3448 from arunagw/instance_disable_fixJosé Valim2011-10-271-1/+2
|\ | | | | Test fix Allow instances to disable record_timestamps
| * Adding more checks for instance_writer falseArun Agrawal2011-10-271-1/+2
| |
| * Test fix Allow instances to disable record_timestampsArun Agrawal2011-10-271-1/+1
|/ | | | Removed here 0d0176c4ffe5c58fd1002efbd8f7bd45a8872e33
* Merge pull request #3445 from odorcicd/fix_railtie_wrap_parameter_testJosé Valim2011-10-261-1/+1
|\ | | | | Fix railtie configuration test calling PostsController#create which didn'
| * Fix railtie configuration test calling PostsController#create which didn't existDenis Odorcic2011-10-271-1/+1
|/
* scumbag 1.8: strings are enumerable :'(Aaron Patterson2011-10-261-1/+1
|
* Allow instances to disable record_timestampsPratik Naik2011-10-262-1/+11
|
* Merge pull request #3439 from bradrobertson/masterVijay Dev2011-10-261-1/+1
|\ | | | | ActiveModel::Validator only takes one parameter, documentation had two params listed.
| * correct documentation on initialize method to accept a single parameterbradrobertson2011-10-261-1/+1
|/
* Merge pull request #3435 from MDaubs/action_pack_deprecationsSantiago Pastorino2011-10-261-4/+4
|\ | | | | Fix deprecation warnings in action pack render tests
| * Fix deprecation warnings in action pack test suite due to passing template ↵Matthew Daubert2011-10-251-4/+4
| | | | | | | | formats in the template name.
* | Responders now return 204 No Content for API requests without a response ↵José Valim2011-10-263-31/+13
| | | | | | | | body (as in the new scaffold)
* | Scaffold returns 204 No Content for API requests without content. This makes ↵José Valim2011-10-262-2/+4
| | | | | | | | scaffold work with jQuery out of the box.
* | Fix failing tests.José Valim2011-10-261-0/+2
| |
* | 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 database
| | * | 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
| | | | | | | | | | | | | | | | | | | | | | | | This should go in your ~/.gitignore. This reverts commit e75c18bff811b95e12634cdbf04df244a227d46d.
| * | | Revert "Merge pull request #3395 from bdurand/fix_file_store_cleanup"José Valim2011-10-253-57/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Tests were failing on Travis-CI. This reverts commit 79d01a8f16e20c556a086a2f07e3ccb4400f9819, reversing changes made to b838570bd69ff13d677fb43e79f10d6f3168c696.
| * | | Merge pull request #3422 from arunagw/unused_var_warningVijay Dev2011-10-251-1/+1
| |\ \ \ | | | | | | | | | | Unused variable removed
| | * | | 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 test
| | * | 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 ↵Xavier Noria2011-10-241-11/+15
| |\ \ | | | | | | | | | | | | | | | | dmitriy-kiriyenko/drop_test_database_in_development_when_running_rake_db_drop When running "rake db:drop" also drop test database in development environment
| | * | 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 RBX
| | * | | 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
| | | | |