Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3448 from arunagw/instance_disable_fix | José Valim | 2011-10-27 | 1 | -1/+2 |
|\ | | | | | Test fix Allow instances to disable record_timestamps | ||||
| * | Adding more checks for instance_writer false | Arun Agrawal | 2011-10-27 | 1 | -1/+2 |
| | | |||||
| * | Test fix Allow instances to disable record_timestamps | Arun Agrawal | 2011-10-27 | 1 | -1/+1 |
|/ | | | | Removed here 0d0176c4ffe5c58fd1002efbd8f7bd45a8872e33 | ||||
* | Merge pull request #3445 from odorcicd/fix_railtie_wrap_parameter_test | José Valim | 2011-10-26 | 1 | -1/+1 |
|\ | | | | | Fix railtie configuration test calling PostsController#create which didn' | ||||
| * | Fix railtie configuration test calling PostsController#create which didn't exist | Denis Odorcic | 2011-10-27 | 1 | -1/+1 |
|/ | |||||
* | scumbag 1.8: strings are enumerable :'( | Aaron Patterson | 2011-10-26 | 1 | -1/+1 |
| | |||||
* | Allow instances to disable record_timestamps | Pratik Naik | 2011-10-26 | 2 | -1/+11 |
| | |||||
* | Merge pull request #3439 from bradrobertson/master | Vijay Dev | 2011-10-26 | 1 | -1/+1 |
|\ | | | | | ActiveModel::Validator only takes one parameter, documentation had two params listed. | ||||
| * | correct documentation on initialize method to accept a single parameter | bradrobertson | 2011-10-26 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #3435 from MDaubs/action_pack_deprecations | Santiago Pastorino | 2011-10-26 | 1 | -4/+4 |
|\ | | | | | Fix deprecation warnings in action pack render tests | ||||
| * | Fix deprecation warnings in action pack test suite due to passing template ↵ | Matthew Daubert | 2011-10-25 | 1 | -4/+4 |
| | | | | | | | | formats in the template name. | ||||
* | | Responders now return 204 No Content for API requests without a response ↵ | José Valim | 2011-10-26 | 3 | -31/+13 |
| | | | | | | | | body (as in the new scaffold) | ||||
* | | Scaffold returns 204 No Content for API requests without content. This makes ↵ | José Valim | 2011-10-26 | 2 | -2/+4 |
| | | | | | | | | scaffold work with jQuery out of the box. | ||||
* | | Fix failing tests. | José Valim | 2011-10-26 | 1 | -0/+2 |
| | | |||||
* | | properly handle lists of lists. Thanks @adrianpike for reporting! | Aaron Patterson | 2011-10-25 | 2 | -1/+15 |
| | | |||||
* | | Merge branch 'master' of github.com:rails/rails | David Heinemeier Hansson | 2011-10-25 | 94 | -392/+1575 |
|\ \ | |||||
| * \ | Merge pull request #3357 from rahul100885/rahul100885_ws | Vijay Dev | 2011-10-25 | 1 | -0/+10 |
| |\ \ | | | | | | | | | Added test case for postgresql database | ||||
| | * | | Added test case for postgresql database | Rahul P. Chaudhari | 2011-10-18 | 1 | -0/+10 |
| | | | | |||||
| * | | | Clean up .gitignore and make a note about using global ignores | Jeremy Kemper | 2011-10-25 | 1 | -25/+22 |
| | | | | |||||
| * | | | Revert "Ignore .rbx directories (rbx compiled bytecode files)" | José Valim | 2011-10-25 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | This should go in your ~/.gitignore. This reverts commit e75c18bff811b95e12634cdbf04df244a227d46d. | ||||
| * | | | Revert "Merge pull request #3395 from bdurand/fix_file_store_cleanup" | José Valim | 2011-10-25 | 3 | -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_warning | Vijay Dev | 2011-10-25 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | Unused variable removed | ||||
| | * | | | Unused variable removed | Arun Agrawal | 2011-10-24 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | safeguard against configs missing environment or the database key | Vijay Dev | 2011-10-26 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
| * | | | Merge pull request #3424 from avakhov/av-scaffold-func-test-remove-to_param | José Valim | 2011-10-24 | 1 | -4/+4 |
| |\ \ \ | | |/ / | |/| | | Remove needless to_param in scaffold functional test | ||||
| | * | | Remove needless to_param in scaffold functional test | Alexey Vakhov | 2011-10-24 | 1 | -4/+4 |
| |/ / | |||||
| * | | minor revision to some new code in databases.rake | Xavier Noria | 2011-10-24 | 1 | -2/+3 |
| | | | |||||
| * | | registers PR #2419 in the CHANGELOG | Xavier Noria | 2011-10-24 | 1 | -0/+3 |
| | | | |||||
| * | | Merge pull request #2419 from ↵ | Xavier Noria | 2011-10-24 | 1 | -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 Kiriyenko | 2011-09-29 | 1 | -11/+15 |
| | | | | |||||
| * | | | Merge pull request #3416 from arunagw/rbx_test_fixes | José Valim | 2011-10-24 | 2 | -2/+9 |
| |\ \ \ | | | | | | | | | | | ActionPack test fix for RBX | ||||
| | * | | | ActionPack test fix for RBX | Arun Agrawal | 2011-10-24 | 2 | -2/+9 |
| |/ / / | |||||
| * | | | Ignore .rbx directories (rbx compiled bytecode files) | Jon Leighton | 2011-10-23 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-10-23 | 4 | -20/+15 |
| |\ \ \ | |||||
| | * | | | edge doesnt provide turn gem in the gemfile anymore | Vijay Dev | 2011-10-23 | 1 | -5/+0 |
| | | | | | |||||
| | * | | | Updated rack version in docs for 3.2 | Arun Agrawal | 2011-10-22 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Rails version to 3.2.0.beta in docs | Arun Agrawal | 2011-10-22 | 1 | -6/+6 |
| | | | | | |||||
| | * | | | Middleware details updated for 3.2 | Arun Agrawal | 2011-10-22 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Add some note on adding index to HABTM table | Prem Sichanugrist | 2011-10-20 | 1 | -0/+4 |
| | | | | | |||||
| | * | | | Use new migration style in HABTM join table | Prem Sichanugrist | 2011-10-20 | 1 | -5/+1 |
| | | | | | | | | | | | | | | | Yes, we're on Rails 3.1 now. | ||||
| | * | | | Fixed typo. | Pepe Hipolito | 2011-10-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Ruby will know to look for this file at => Ruby will know how to look for this file at | ||||
| | * | | | Fixed typo. | Pepe Hipolito | 2011-10-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | a long the way => along the way | ||||
| * | | | | Merge pull request #3352 from arunagw/bump_sprockets | Vijay Dev | 2011-10-22 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | | | Bump sprockets | ||||
| | * | | | | Bump sprockets | Arun Agrawal | 2011-10-17 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge pull request #3408 from guilleiguaran/remove-turn | José Valim | 2011-10-22 | 3 | -28/+0 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Remove Turn from default Gemfile. | ||||
| | * | | | | | Remove Turn from default Gemfile. | Guillermo Iguaran | 2011-10-22 | 3 | -28/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | We still looking for a best presentation for tests output. | ||||
| * | | | | | | Revert "Merge pull request #3405 from arunagw/middleware_name" | Aaron Patterson | 2011-10-22 | 1 | -1/+1 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c33090523c3504a2a125d7f725a7f2a4b99ff3c0, reversing changes made to 1c1c3fc2c06fc02e67a8272adf2c2d2381e005b4. | ||||
| * | | | | | Merge pull request #3405 from arunagw/middleware_name | Aaron Patterson | 2011-10-22 | 1 | -1/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Using middleware name to show proper name in the info | ||||
| | * | | | | | Using middleware name to show proper name in the info | Arun Agrawal | 2011-10-22 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | minor fixes in the composed_of doc | Vijay Dev | 2011-10-22 | 1 | -3/+4 |
| | | | | | | |