aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * Add oscardelben to authorsOscar Del Ben2012-05-172-0/+4
| * fix CollectionAssociation#replace docsFrancesco Rodriguez2012-05-171-3/+3
| * update AS docsVasiliy Ermolovich2012-05-171-6/+2
| * Add docs to CollectionAssociation#replaceFrancesco Rodriguez2012-05-171-3/+23
* | Add CHANGELOG entry for #6369 & #6391Andrew White2012-05-191-0/+2
* | Merge pull request #4835 from pacoguzman/refactor_define_restrict_dependency_...Carlos Antonio da Silva2012-05-191-3/+3
|\ \
| * | Refactor define_restrict_dependency_method using reflectionPaco Guzman2012-02-011-3/+3
* | | Merge pull request #5678 from troyk/patch-1Carlos Antonio da Silva2012-05-191-1/+1
|\ \ \
| * | | Remove sort on attributes.keysTroy Kruthoff2012-03-301-1/+1
* | | | Clarify grouped_options_for_select method API, add changelog entryCarlos Antonio da Silva2012-05-193-16/+19
* | | | Remove delegated methods from generators test caseCarlos Antonio da Silva2012-05-191-1/+0
* | | | Remove warning in namespaced generator testCarlos Antonio da Silva2012-05-191-1/+1
* | | | Fix railties testsPiotr Sarnacki2012-05-191-1/+1
* | | | Ensure that CollectionAssociation#replace returns proper targetPiotr Sarnacki2012-05-192-3/+3
* | | | Improve `rake routes` output for redirects - closes #6369.Andrew White2012-05-193-17/+30
* | | | Merge pull request #6376 from jgaskins/timestamp-microsecondsJeremy Kemper2012-05-184-3/+6
|\ \ \ \
| * | | | Increase `AR#cache_key` precision to nanosecondsJamie Gaskins2012-05-194-3/+6
* | | | | Merge pull request #6384 from ihid/tidy_text_helpersJeremy Kemper2012-05-182-14/+62
|\ \ \ \ \