Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fixes a typo (thanks to Alexey Vakhov) | Xavier Noria | 2011-10-30 | 1 | -1/+1 |
| | |||||
* | Merge pull request #3464 from kennyj/avoid_to_call_twice | Santiago Pastorino | 2011-10-29 | 1 | -8/+5 |
|\ | | | | | avoided to call `Marshal.dump` twice | ||||
| * | avoided to call twice | kennyj | 2011-10-30 | 1 | -8/+5 |
| | | |||||
* | | defines Module#qualified_const_(defined?|get|set) and String#deconstantize | Xavier Noria | 2011-10-29 | 10 | -13/+311 |
| | | | | | | | | | | | | | | | | | | | | This commit also implements a faster version of #demodulize I was unable to isolate with git add --patch. Not a big fan of the name #deconstantize. It complements #demodulize getting rid of the rightmost constant, hence the name, but it is unrelated to the well-known #constantize. So unsure. Could not come with anything better, please feel free to rename. | ||||
* | | Merge pull request #3463 from kennyj/fix_document_for_cache | Santiago Pastorino | 2011-10-29 | 1 | -1/+1 |
|\ \ | | | | | | | fix a document for race_condition_ttl. ActiveSupport::Cache::MemoryCache isn't exist. | ||||
| * | | fix a document for race_condition_ttl. ActiveSupport::Cache::MemoryCache ↵ | kennyj | 2011-10-30 | 1 | -1/+1 |
| | | | | | | | | | | | | isn't exist | ||||
* | | | Removing db/seeds.rb is fine. Don't blow up. | Jeremy Kemper | 2011-10-29 | 2 | -2/+8 |
| |/ |/| | |||||
* | | Merge pull request #3462 from kennyj/remove_deprecated_code | José Valim | 2011-10-29 | 1 | -2/+0 |
|\ \ | |/ |/| | removed a reference to SynchronizedMemoryStore and CompressedMemCacheStore | ||||
| * | removed reference to SynchronizedMemoryStore and CompressedMemCacheStore ↵ | kennyj | 2011-10-30 | 1 | -2/+0 |
|/ | | | | (the remaining code from 9cafc28874) | ||||
* | Merge pull request #3337 from htanata/fix_rake_routes_for_controller_only_route | José Valim | 2011-10-29 | 2 | -9/+18 |
|\ | | | | | Remove trailing "#" on rake routes for controller only routes | ||||
| * | On inpsect routes, show :controller and :action to indicate dynamic. | Hendy Tanata | 2011-10-29 | 2 | -9/+18 |
| | | |||||
* | | Merge pull request #3460 from arunagw/method_redefine_warning_removed | Xavier Noria | 2011-10-29 | 1 | -0/+1 |
|\ \ | | | | | | | method redefined warning removed! | ||||
| * | | method redefined warning removed! | Arun Agrawal | 2011-10-29 | 1 | -0/+1 |
|/ / | |||||
* | | Merge pull request #3459 from arunagw/running_test_doc_fix | Vijay Dev | 2011-10-29 | 1 | -1/+1 |
|\ \ | | | | | | | ActiveRecord is no more in controller directory. | ||||
| * | | ActiveRecord is no more in controller directory. | Arun Agrawal | 2011-10-29 | 1 | -1/+1 |
| | | | |||||
* | | | let demodulize do less work, and add tests | Xavier Noria | 2011-10-29 | 2 | -1/+5 |
|/ / | | | | | | | This is also faster on 1.9. | ||||
* | | Merge pull request #3456 from pwim/documentation-fix | José Valim | 2011-10-27 | 1 | -1/+1 |
|\ \ | | | | | | | Add missing type to number_field_tag documentation | ||||
| * | | Add missing type to number_field_tag documentation | Paul McMahon | 2011-10-28 | 1 | -1/+1 |
|/ / | |||||
* | | clear statement cache when tables are altered | Aaron Patterson | 2011-10-27 | 1 | -0/+6 |
| | | |||||
* | | Added failing test case for changing schema in migration not clearing the ↵ | Joe Van Dyk | 2011-10-27 | 1 | -0/+12 |
|/ | | | | prepared statement cache | ||||
* | Merge pull request #3449 from arunagw/checks_for_instance_writers | José Valim | 2011-10-27 | 1 | -1/+2 |
|\ | | | | | More checks for instance writers. | ||||
| * | More checks for instance writers. | Arun Agrawal | 2011-10-27 | 1 | -1/+2 |
|/ | |||||
* | 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 |
| | | |