aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge pull request #5702 from oscardelben/patch-4Piotr Sarnacki2012-05-191-3/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Call undefine_attribute_methods only when defining new attributesOscar Del Ben2012-05-181-3/+1
* | | | | | Merge pull request #5631 from avakhov/ac-log-subsriber-small-refacPiotr Sarnacki2012-05-191-3/+1
|\ \ \ \ \ \
| * | | | | | Make AC::LogSubscriber#send_file like #send_dataAlexey Vakhov2012-05-191-3/+1
* | | | | | | Merge pull request #6397 from kennyj/fix_translate_exceptionAaron Patterson2012-05-191-3/+7
|\ \ \ \ \ \ \
| * | | | | | | Fix a problem of translate_exception method in Japanese.kennyj2012-05-201-3/+7
* | | | | | | | Merge pull request #6398 from pmahoney/threadsafe-connection-poolAaron Patterson2012-05-191-4/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Synchronize read and modification of @reserved_connections hash to avoid conc...Patrick Mahoney2012-05-191-4/+8
|/ / / / / / /
* | | | | | | Merge pull request #6396 from kennyj/dont_use_assert_blockRafael Mendonça França2012-05-192-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Don't use assert_block method. It will be deprecated.kennyj2012-05-202-2/+2
* | | | | | | | Merge pull request #3359 from mrreynolds/datamapper_naming_fixRafael Mendonça França2012-05-194-13/+13
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fixed DataMapper namings in symbols and constants.Robert Glaser2011-10-184-13/+13
* | | | | | | | Merge pull request #6395 from kennyj/fix_warning_20120519-2Rafael Mendonça França2012-05-191-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix warning: shadowing outer local variable - constant.kennyj2012-05-191-3/+3
|/ / / / / / / /
* | | | | | | | Add CHANGELOG entry for constantize - closes #6165.Andrew White2012-05-191-0/+2
* | | | | | | | Handle case where ancestor is not the end of the chainAndrew White2012-05-192-7/+14
* | | | | | | | Fix constantize so top level constants are looked up properly.Marc-Andre Lafortune2012-05-192-1/+19
* | | | | | | | Make constantize look down the ancestor chain (excluding Object)Marc-Andre Lafortune2012-05-192-1/+30
* | | | | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-199-34/+315
|\ \ \ \ \ \ \ \
| * | | | | | | | copy edits [ci skip]Vijay Dev2012-05-191-17/+20
| * | | | | | | | add CollectionProxy#last documentationFrancesco Rodriguez2012-05-191-0/+27
| * | | | | | | | add CollectionProxy#first documentationFrancesco Rodriguez2012-05-191-0/+27
| * | | | | | | | copy edits [ci skip]Vijay Dev2012-05-191-1/+1
| * | | | | | | | Revert "You can add a custom primary key to a table"Vijay Dev2012-05-191-5/+0
| * | | | | | | | fix typo. probem => problemDamien Mathieu2012-05-191-1/+1
| * | | | | | | | improve CollectionProxy#concat documentationFrancesco Rodriguez2012-05-191-7/+18
| * | | | | | | | fix CollectionProxy#<< documentationFrancesco Rodriguez2012-05-191-1/+1
| * | | | | | | | add CollectionProxy#<< documentationFrancesco Rodriguez2012-05-191-0/+20
| * | | | | | | | add CollectionProxy#clear documentationFrancesco Rodriguez2012-05-191-0/+26
| * | | | | | | | add CollectionProxy#include? documentationFrancesco Rodriguez2012-05-181-0/+13
| * | | | | | | | minor fix wrapper tag documentationFrancesco Rodriguez2012-05-181-1/+1
| * | | | | | | | You can add a custom primary key to a tableAvi Tzurel2012-05-191-0/+5
| * | | | | | | | Minor fix to the wrapper tag documentation, the options hash is the last one,...Avi Tzurel2012-05-191-1/+1
| * | | | | | | | Merge branch 'master' of github.com:lifo/docrailsAvi Tzurel2012-05-196-130/+155
| |\ \ \ \ \ \ \ \
| | * | | | | | | | move docs from CollectionAssociation to CollectionProxyFrancesco Rodriguez2012-05-182-114/+143
| | * | | | | | | | add explanation of raising errors when a limit scope is supplied in Relation#...Francesco Rodriguez2012-05-181-11/+11
| | * | | | | | | | Revert "Add oscardelben to authors"Oscar Del Ben2012-05-182-4/+0
| | * | | | | | | | Fix typo.Peter Suschlik2012-05-181-1/+1
| * | | | | | | | | Added wrapper tag documentation to the simple_format methodAvi Tzurel2012-05-191-1/+4
| |/ / / / / / / /
| * | | | | | | | The middleware stack is compliant with Enumarable and bits of ArrayRich Healey2012-05-181-2/+2
| * | | | | | | | remove incorrect example of CollectionAssociation#empty?Francesco Rodriguez2012-05-181-17/+0
| * | | | | | | | add docs to CollectionAssociation#empty?Francesco Rodriguez2012-05-181-3/+32
| * | | | | | | | add docs to CollectionAssociation#any?Francesco Rodriguez2012-05-181-0/+30
| * | | | | | | | add examples to CollectionAssociation#concatFrancesco Rodriguez2012-05-181-3/+14
| * | | | | | | | fix CollectionAssociation docsFrancesco Rodriguez2012-05-171-1/+1
| * | | | | | | | add example to CollectionAssociation#destroy_allFrancesco Rodriguez2012-05-171-3/+14
| * | | | | | | | add more explanation to CollectionAssociation docsFrancesco Rodriguez2012-05-171-0/+4
| * | | | | | | | add CollectionAssociation hierarchyFrancesco Rodriguez2012-05-171-2/+7
| * | | | | | | | add docs to CollectionAssociation#many?Francesco Rodriguez2012-05-171-1/+34
| * | | | | | | | [engines] initializer method call needs an argument for initializer nameRyan Bigg2012-05-181-1/+1