| Commit message (Expand) | Author | Age | Files | Lines |
* | Upgrading mocha 0.11.2 | Arun Agrawal | 2012-04-24 | 1 | -1/+1 |
* | Only include Rake::DSL if it's defined. | Joe Van Dyk | 2012-04-23 | 1 | -1/+1 |
* | Merge pull request #5887 from mcrowe/document-relation-merge | Vijay Dev | 2012-04-23 | 1 | -0/+14 |
|\ |
|
| * | Add documentation to the SpawnMethods#merge method. | Mitch Crowe | 2012-04-17 | 1 | -0/+14 |
* | | Merge pull request #5930 from carlosantoniodasilva/generated-attribute-refactor | José Valim | 2012-04-22 | 1 | -7/+10 |
|\ \ |
|
| * | | Refactor GeneratedAttributes | Carlos Antonio da Silva | 2012-04-22 | 1 | -7/+10 |
|/ / |
|
* | | Merge pull request #5917 from oscardelben/master | Piotr Sarnacki | 2012-04-21 | 1 | -1/+0 |
|\ \ |
|
| * | | Remove circular require of time/zones | Oscar Del Ben | 2012-04-21 | 1 | -1/+0 |
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-04-21 | 39 | -314/+391 |
|\ \ \
| |/ /
|/| | |
|
| * | | Revert "in feedback solicitation text, correct that docrails is fork, not bra... | Vijay Dev | 2012-04-21 | 1 | -1/+1 |
| * | | Merge branch 'master' of github.com:lifo/docrails | Oscar Del Ben | 2012-04-21 | 2 | -2/+2 |
| |\ \ |
|
| | * | | Comma missed | Alexey Vakhov | 2012-04-21 | 1 | -1/+1 |
| | * | | in feedback solicitation text, correct that docrails is fork, not branch | Rory O’Kane | 2012-04-20 | 1 | -1/+1 |
| * | | | Add validation code to getting started guide and improve validation | Oscar Del Ben | 2012-04-21 | 4 | -10/+24 |
| * | | | Add model validation section to Getting Started guide | Oscar Del Ben | 2012-04-21 | 11 | -96/+93 |
| |/ / |
|
| * | | Merge branch 'master' of github.com:lifo/docrails | Oscar Del Ben | 2012-04-20 | 2 | -2/+2 |
| |\ \ |
|
| | * | | Fix example in ActionView::Helpers::FormHelper | Thibaut Courouble | 2012-04-20 | 1 | -1/+1 |
| | * | | removed extra "you" | Kevin Musiorski | 2012-04-19 | 1 | -1/+1 |
| * | | | Add index and links section to Getting started guide | Oscar Del Ben | 2012-04-20 | 11 | -24/+123 |
| * | | | Add show action in getting started guide | Oscar Del Ben | 2012-04-20 | 6 | -27/+63 |
| * | | | New Getting started guide wont have tags | Oscar Del Ben | 2012-04-20 | 6 | -36/+1 |
| * | | | Adapt "Getting started guide" code sample | Oscar Del Ben | 2012-04-20 | 8 | -129/+36 |
| * | | | Add "Saving data in the controller" section | Oscar Del Ben | 2012-04-20 | 1 | -0/+27 |
| |/ / |
|
| * | | Add model creation step to getting started guide | Oscar Del Ben | 2012-04-19 | 1 | -6/+27 |
| * | | Fix broken images links | Oscar Del Ben | 2012-04-19 | 1 | -5/+4 |
| * | | Add Ruby 1.9.3 recommendation | Oscar Del Ben | 2012-04-19 | 1 | -2/+2 |
| * | | Put warning on getting started guide back | Oscar Del Ben | 2012-04-19 | 1 | -1/+3 |
| * | | Add "Using the change method" title back to make it stand out | Oscar Del Ben | 2012-04-19 | 1 | -0/+2 |
| * | | Regenerate Gemfile for getting started guide | Oscar Del Ben | 2012-04-19 | 1 | -3/+3 |
| * | | Update guide for rails 3.2.3, fix code download link. | Oscar Del Ben | 2012-04-19 | 1 | -5/+4 |
| * | | Add to guides info how to disable prepared statements | Ivan Evtukhovich | 2012-04-19 | 1 | -0/+7 |
| * | | Improve observers documentation | Oscar Del Ben | 2012-04-18 | 1 | -0/+2 |
| * | | Fix formatting | Oscar Del Ben | 2012-04-18 | 1 | -2/+2 |
* | | | Merge pull request #5865 from tiegz/minor_fixes | Aaron Patterson | 2012-04-20 | 2 | -35/+22 |
|\ \ \ |
|
| * | | | converting some tests to assert_raises, and DRY'ing retrieve_variable changes | Tieg Zaharia | 2012-04-16 | 2 | -40/+18 |
| * | | | catch nil.to_sym errors in partial_renderer, and raise ArgumentError instead | Tieg Zaharia | 2012-04-16 | 2 | -1/+10 |
* | | | | Freeze the middleware stack after it's built | Jeremy Kemper | 2012-04-20 | 3 | -18/+26 |
* | | | | Merge pull request #5900 from amatsuda/ar_mysql_pk_with_using_option | Jeremy Kemper | 2012-04-19 | 2 | -1/+31 |
|\ \ \ \ |
|
| * | | | | be sure to currectly fetch PK name from MySQL even if the PK has some custom ... | Akira Matsuda | 2012-04-19 | 2 | -1/+31 |
|/ / / / |
|
* | | | | Remove unused generator options. This was added for the removed rails new --http | Santiago Pastorino | 2012-04-18 | 3 | -9/+0 |
* | | | | Add hook for add_resource_route | Santiago Pastorino | 2012-04-18 | 3 | -7/+16 |
* | | | | Merge pull request #5891 from kennyj/remove_time_directory | Jeremy Kemper | 2012-04-18 | 1 | -5/+0 |
|\ \ \ \ |
|
| * | | | | Remove unused code. We should use 'active_support/time'. | kennyj | 2012-04-19 | 1 | -5/+0 |
|/ / / / |
|
* | | | | Merge pull request #5889 from juanazam/juan-master | Santiago Pastorino | 2012-04-18 | 1 | -0/+2 |
|\ \ \ \
| |_|_|/
|/| | | |
|
| * | | | Add missing dependency for active_record_deprecated_finders | Juan Manuel Azambuja | 2012-04-18 | 1 | -0/+2 |
|/ / / |
|
* | | | Merge pull request #5869 from LachyGroom/patch-1 | Piotr Sarnacki | 2012-04-17 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | Changes b tag to strong
| CollectiveJam | 2012-04-16 | 1 | -1/+1 |
* | | | | Merge pull request #5882 from vijaydev/fix_generated_attribute_build | Santiago Pastorino | 2012-04-17 | 1 | -2/+4 |
|\ \ \ \ |
|
| * | | | | the index option is always created if the type is one of references or belong... | Vijay Dev | 2012-04-18 | 1 | -2/+4 |
|/ / / / |
|
* | | / | let's not use `and` in place of `&&` | Vijay Dev | 2012-04-18 | 1 | -1/+1 |
| |_|/
|/| | |
|