Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge pull request #6050 from route/wrapped_keys_in_log | José Valim | 2012-05-20 | 2 | -1/+10 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Show in log correct wrapped keys | |||||
| * | | | | | | Show in log correct wrapped keys | Dmitry Vorotilin | 2012-05-20 | 2 | -1/+10 | |
| | | | | | | | ||||||
* | | | | | | | Improve docs for `try` by adding note on `BasicObject` | Piotr Sarnacki | 2012-05-20 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] closes #5790 | |||||
* | | | | | | | Merge pull request #5702 from oscardelben/patch-4 | Piotr Sarnacki | 2012-05-19 | 1 | -3/+1 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Call undefine_attribute_methods only when defining new attributes | |||||
| * | | | | | | Call undefine_attribute_methods only when defining new attributes | Oscar Del Ben | 2012-05-18 | 1 | -3/+1 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #5631 from avakhov/ac-log-subsriber-small-refac | Piotr Sarnacki | 2012-05-19 | 1 | -3/+1 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Make AC::LogSubscriber#send_file like #send_data | |||||
| * | | | | | | | Make AC::LogSubscriber#send_file like #send_data | Alexey Vakhov | 2012-05-19 | 1 | -3/+1 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #6397 from kennyj/fix_translate_exception | Aaron Patterson | 2012-05-19 | 1 | -3/+7 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix a problem of translate_exception method in a Japanese (non English) environment. | |||||
| * | | | | | | | | Fix a problem of translate_exception method in Japanese. | kennyj | 2012-05-20 | 1 | -3/+7 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #6398 from pmahoney/threadsafe-connection-pool | Aaron Patterson | 2012-05-19 | 1 | -4/+8 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | Synchronize read and modification of @reserved_connections | |||||
| * | | | | | | | | Synchronize read and modification of @reserved_connections hash to avoid ↵ | Patrick Mahoney | 2012-05-19 | 1 | -4/+8 | |
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | concurrency error. | |||||
* | | | | | | | | Merge pull request #6396 from kennyj/dont_use_assert_block | Rafael Mendonça França | 2012-05-19 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Don't use assert_block method. It will be removed. | |||||
| * | | | | | | | | Don't use assert_block method. It will be deprecated. | kennyj | 2012-05-20 | 2 | -2/+2 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #3359 from mrreynolds/datamapper_naming_fix | Rafael Mendonça França | 2012-05-19 | 4 | -13/+13 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | Fixed DataMapper namings in symbols and constants. | |||||
| * | | | | | | | | Fixed DataMapper namings in symbols and constants. | Robert Glaser | 2011-10-18 | 4 | -13/+13 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #6395 from kennyj/fix_warning_20120519-2 | Rafael Mendonça França | 2012-05-19 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix warning: shadowing outer local variable - constant. | |||||
| * | | | | | | | | | Fix warning: shadowing outer local variable - constant. | kennyj | 2012-05-19 | 1 | -3/+3 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Add CHANGELOG entry for constantize - closes #6165. | Andrew White | 2012-05-19 | 1 | -0/+2 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Handle case where ancestor is not the end of the chain | Andrew White | 2012-05-19 | 2 | -7/+14 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Fix constantize so top level constants are looked up properly. | Marc-Andre Lafortune | 2012-05-19 | 2 | -1/+19 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Make constantize look down the ancestor chain (excluding Object) | Marc-Andre Lafortune | 2012-05-19 | 2 | -1/+30 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-19 | 9 | -34/+315 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | copy edits [ci skip] | Vijay Dev | 2012-05-19 | 1 | -17/+20 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | add CollectionProxy#last documentation | Francesco Rodriguez | 2012-05-19 | 1 | -0/+27 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | add CollectionProxy#first documentation | Francesco Rodriguez | 2012-05-19 | 1 | -0/+27 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | copy edits [ci skip] | Vijay Dev | 2012-05-19 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Revert "You can add a custom primary key to a table" | Vijay Dev | 2012-05-19 | 1 | -5/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 23a98ffbd9b39ee70094ded1671cf1879d0d3591. [ci skip] | |||||
| * | | | | | | | | | fix typo. probem => problem | Damien Mathieu | 2012-05-19 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | improve CollectionProxy#concat documentation | Francesco Rodriguez | 2012-05-19 | 1 | -7/+18 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | fix CollectionProxy#<< documentation | Francesco Rodriguez | 2012-05-19 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | add CollectionProxy#<< documentation | Francesco Rodriguez | 2012-05-19 | 1 | -0/+20 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | add CollectionProxy#clear documentation | Francesco Rodriguez | 2012-05-19 | 1 | -0/+26 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | add CollectionProxy#include? documentation | Francesco Rodriguez | 2012-05-18 | 1 | -0/+13 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | minor fix wrapper tag documentation | Francesco Rodriguez | 2012-05-18 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | You can add a custom primary key to a table | Avi Tzurel | 2012-05-19 | 1 | -0/+5 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Minor fix to the wrapper tag documentation, the options hash is the last ↵ | Avi Tzurel | 2012-05-19 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | one, added blank hash before that in the args list | |||||
| * | | | | | | | | | Merge branch 'master' of github.com:lifo/docrails | Avi Tzurel | 2012-05-19 | 6 | -130/+155 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | move docs from CollectionAssociation to CollectionProxy | Francesco Rodriguez | 2012-05-18 | 2 | -114/+143 | |
| | | | | | | | | | | | ||||||
| | * | | | | | | | | | add explanation of raising errors when a limit scope is supplied in ↵ | Francesco Rodriguez | 2012-05-18 | 1 | -11/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relation#delete_all | |||||
| | * | | | | | | | | | Revert "Add oscardelben to authors" | Oscar Del Ben | 2012-05-18 | 2 | -4/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 33284014c65f7cb0c342caeeda32baf10db71cfc. Reason: this change doesn't belong to DocRails. | |||||
| | * | | | | | | | | | Fix typo. | Peter Suschlik | 2012-05-18 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Added wrapper tag documentation to the simple_format method | Avi Tzurel | 2012-05-19 | 1 | -1/+4 | |
| |/ / / / / / / / / | ||||||
| * | | | | | | | | | The middleware stack is compliant with Enumarable and bits of Array | Rich Healey | 2012-05-18 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Try to clarify the docs so that it's more clear how the stack behaves. | |||||
| * | | | | | | | | | remove incorrect example of CollectionAssociation#empty? | Francesco Rodriguez | 2012-05-18 | 1 | -17/+0 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | add docs to CollectionAssociation#empty? | Francesco Rodriguez | 2012-05-18 | 1 | -3/+32 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | add docs to CollectionAssociation#any? | Francesco Rodriguez | 2012-05-18 | 1 | -0/+30 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | add examples to CollectionAssociation#concat | Francesco Rodriguez | 2012-05-18 | 1 | -3/+14 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | fix CollectionAssociation docs | Francesco Rodriguez | 2012-05-17 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | add example to CollectionAssociation#destroy_all | Francesco Rodriguez | 2012-05-17 | 1 | -3/+14 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | add more explanation to CollectionAssociation docs | Francesco Rodriguez | 2012-05-17 | 1 | -0/+4 | |
| | | | | | | | | | |