aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Support i18n attributes for confirmationBrian Cardarella2012-04-243-3/+23
|
* Reordered changelog entryBrian Cardarella2012-04-231-2/+2
|
* Updated CHANGELOGBrian Cardarella2012-04-231-0/+2
|
* confirmation validation error attributeBrian Cardarella2012-04-236-11/+16
| | | | | | | | | | | | This will render the error message on :#{attribute}_confirmation instead of on attribute itself. When rendering confirmation errors inline on the form with form builders such as SimpleForm and Formtastic it is confusing to the ender user to see the confirmation error message on the attribute element. Instead it makes more sense to have this validation error render on the confirmation field instead. The i18n message has been updated for the confirmation validator error message to include the original attribute name.
* Only include Rake::DSL if it's defined.Joe Van Dyk2012-04-231-1/+1
| | | | rake < 0.9 doesn't define Rake::DSL.
* Merge pull request #5887 from mcrowe/document-relation-mergeVijay Dev2012-04-231-0/+14
|\ | | | | Add documentation to the SpawnMethods#merge method.
| * Add documentation to the SpawnMethods#merge method.Mitch Crowe2012-04-171-0/+14
| |
* | Merge pull request #5930 from carlosantoniodasilva/generated-attribute-refactorJosé Valim2012-04-221-7/+10
|\ \ | | | | | | Refactor GeneratedAttributes
| * | Refactor GeneratedAttributesCarlos Antonio da Silva2012-04-221-7/+10
|/ / | | | | | | | | | | | | | | * Move reference? method to class to remove duplicated code * Move to_sym typecast from #initialize to .parse method (make it easier to refactor reference?), remove AS object/blank require * Use []= instead of merge!({}) * Remove in? in favor of include?, remove AS object/inclusion require
* | Merge pull request #5917 from oscardelben/masterPiotr Sarnacki2012-04-211-1/+0
|\ \ | | | | | | Remove circular require warning
| * | Remove circular require of time/zonesOscar Del Ben2012-04-211-1/+0
| | |
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-2139-314/+391
|\ \ \ | |/ / |/| |
| * | Revert "in feedback solicitation text, correct that docrails is fork, not ↵Vijay Dev2012-04-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | branch" This reverts commit 7b7cc1341bd41106c0e6c5eb399f8aff39b43f52. Reason: docrails isn't a rails fork. See 5444ed56ab38a742b3ddf6612eadd8cf50d8d517 [ci skip]
| * | Merge branch 'master' of github.com:lifo/docrailsOscar Del Ben2012-04-212-2/+2
| |\ \
| | * | Comma missedAlexey Vakhov2012-04-211-1/+1
| | | |
| | * | in feedback solicitation text, correct that docrails is fork, not branchRory O’Kane2012-04-201-1/+1
| | | |
| * | | Add validation code to getting started guide and improve validationOscar Del Ben2012-04-214-10/+24
| | | | | | | | | | | | | | | | section
| * | | Add model validation section to Getting Started guideOscar Del Ben2012-04-2111-96/+93
| |/ /
| * | Merge branch 'master' of github.com:lifo/docrailsOscar Del Ben2012-04-202-2/+2
| |\ \
| | * | Fix example in ActionView::Helpers::FormHelperThibaut Courouble2012-04-201-1/+1
| | | |
| | * | removed extra "you"Kevin Musiorski2012-04-191-1/+1
| | | |
| * | | Add index and links section to Getting started guideOscar Del Ben2012-04-2011-24/+123
| | | |
| * | | Add show action in getting started guideOscar Del Ben2012-04-206-27/+63
| | | |
| * | | New Getting started guide wont have tagsOscar Del Ben2012-04-206-36/+1
| | | |
| * | | Adapt "Getting started guide" code sampleOscar Del Ben2012-04-208-129/+36
| | | |
| * | | Add "Saving data in the controller" sectionOscar Del Ben2012-04-201-0/+27
| |/ /
| * | Add model creation step to getting started guideOscar Del Ben2012-04-191-6/+27
| | |
| * | Fix broken images linksOscar Del Ben2012-04-191-5/+4
| | |
| * | Add Ruby 1.9.3 recommendationOscar Del Ben2012-04-191-2/+2
| | |
| * | Put warning on getting started guide backOscar Del Ben2012-04-191-1/+3
| | |
| * | Add "Using the change method" title back to make it stand outOscar Del Ben2012-04-191-0/+2
| | |
| * | Regenerate Gemfile for getting started guideOscar Del Ben2012-04-191-3/+3
| | |
| * | Update guide for rails 3.2.3, fix code download link.Oscar Del Ben2012-04-191-5/+4
| | |
| * | Add to guides info how to disable prepared statementsIvan Evtukhovich2012-04-191-0/+7
| | |
| * | Improve observers documentationOscar Del Ben2012-04-181-0/+2
| | |
| * | Fix formattingOscar Del Ben2012-04-181-2/+2
| | |
* | | Merge pull request #5865 from tiegz/minor_fixesAaron Patterson2012-04-202-35/+22
|\ \ \ | | | | | | | | Catch nil.to_sym errors in partial_renderer, and raise ArgumentError instead
| * | | converting some tests to assert_raises, and DRY'ing retrieve_variable changesTieg Zaharia2012-04-162-40/+18
| | | |
| * | | catch nil.to_sym errors in partial_renderer, and raise ArgumentError insteadTieg Zaharia2012-04-162-1/+10
| | | |
* | | | Freeze the middleware stack after it's builtJeremy Kemper2012-04-203-18/+26
| | | | | | | | | | | | | | | | | | | | | | | | So apps that accidentally add middlewares later aren't unwittingly dumping them in a black hole. Closes #5911
* | | | Merge pull request #5900 from amatsuda/ar_mysql_pk_with_using_optionJeremy Kemper2012-04-192-1/+31
|\ \ \ \ | | | | | | | | | | current MySQL driver fails to fetch PK name when the PK has USING option
| * | | | be sure to currectly fetch PK name from MySQL even if the PK has some custom ↵Akira Matsuda2012-04-192-1/+31
|/ / / / | | | | | | | | | | | | option
* | | | Remove unused generator options. This was added for the removed rails new --httpSantiago Pastorino2012-04-183-9/+0
| | | |
* | | | Add hook for add_resource_routeSantiago Pastorino2012-04-183-7/+16
| | | |
* | | | Merge pull request #5891 from kennyj/remove_time_directoryJeremy Kemper2012-04-181-5/+0
|\ \ \ \ | | | | | | | | | | Remove dead code: active_support/time/autoload.rb was moved to active_support/time.rb
| * | | | Remove unused code. We should use 'active_support/time'.kennyj2012-04-191-5/+0
|/ / / /
* | | | Merge pull request #5889 from juanazam/juan-masterSantiago Pastorino2012-04-181-0/+2
|\ \ \ \ | |_|_|/ |/| | | Add missing dependency for active_record_deprecated_finders
| * | | Add missing dependency for active_record_deprecated_findersJuan Manuel Azambuja2012-04-181-0/+2
|/ / /
* | | Merge pull request #5869 from LachyGroom/patch-1Piotr Sarnacki2012-04-171-1/+1
|\ \ \ | | | | | | | | Changes b tag to strong
| * | | Changes b tag to strong CollectiveJam2012-04-161-1/+1
| | | | | | | | | | | | | | | | The change is made due to importance of the attribute name (e.g. Name:) on the page (versus just stylistic / appearance sake tag).