aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix typo in AP CHANGELOG [ci skip]Vasiliy Ermolovich2012-03-131-1/+1
|
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-1317-129/+260
|\
| * Fix AM GuideAlexey Vakhov2012-03-131-1/+1
| | | | | | | | Use proc as default argument to recaculate recipients array every time
| * mark engines guide as wip [ci skip]Vijay Dev2012-03-131-0/+1
| |
| * Revert "Fixed Issue #2884 ActiveModel::SecurePassword code / rdoc conflict; ↵Vijay Dev2012-03-132-17/+0
| | | | | | | | | | | | | | | | an elucidated explanation has been provided and ActiveModel en-locale updated to present a less confusing attribute name for 'password_digest' in form errors due to "has_secure_password"" This reverts commit ddbea9474e20a40e80110944c1e3493ba0efe572. Reason: Includes non-doc changes.
| * copy-edit contributing guide [ci skip]Vijay Dev2012-03-131-2/+2
| |
| * Merge remote-tracking branch 'origin/master'Mark Thomson2012-03-139-49/+86
| |\
| | * [config guide] Add mass_assignment_sanitizer to Active Record config optionsRyan Bigg2012-03-121-0/+2
| | |
| | * Advise to keep secret token privateFilipe Moreira2012-03-121-0/+2
| | |
| | * Advise to keep secret token privateFilipe Moreira2012-03-121-0/+2
| | |
| | * Merge remote-tracking branch 'original_repo/master'Avi Tzurel2012-03-1211-117/+208
| | |\
| | | * Add engines guide to documents.yamlRyan Bigg2012-03-111-0/+4
| | | |
| | | * [instrumentation] Add further action placeholdersRyan Bigg2012-03-111-0/+12
| | | |
| | | * [instrumentation guide] Cover deliver.action_mailer eventRyan Bigg2012-03-111-0/+18
| | | |
| | | * [instrumentation guide] Cover receive.action_mailer eventRyan Bigg2012-03-111-0/+27
| | | |
| | | * Fixed Issue #2884 ActiveModel::SecurePassword code / rdoc conflict; an ↵Michael de Silva2012-03-112-0/+17
| | | | | | | | | | | | | | | | elucidated explanation has been provided and ActiveModel en-locale updated to present a less confusing attribute name for 'password_digest' in form errors due to "has_secure_password"
| | | * attr_accessor_with_default was deprecated and removed. Andrew France2012-03-111-49/+0
| | | | | | | | | | | | Deprecated in 673372152032a886ba9196c69348386834590eab and removed in 9cafc28874a681082f9f7e1e445db91f195a25ae.
| | * | Squash commits into a single commitAvi Tzurel2012-03-111-0/+2
| | | |
| * | | Added documentation for the ActionController::MimeResponds::Collector class.Mark Thomson2012-03-131-1/+24
| | |/ | |/|
| * | Revised explanation of fields_for usage.Mark Thomson2012-03-111-10/+39
| | | | | | | | | | | | Minor tweak to previous comments on form_for and form_helper.rb preamble
| * | added clarification stating the counter_cache attribute needs to be created ↵Michael de Silva2012-03-111-1/+3
| | | | | | | | | | | | on the associate class via a migration
| * | Added clarification to description of how initial form values are derived.Mark Thomson2012-03-101-1/+2
| | |
| * | Merge branch '3.9.12'Mark Thomson2012-03-101-53/+84
| |\ \
| | * | Revised explanation of form_for usageMark Thomson2012-03-101-53/+84
| | | |
| * | | Merge branch 'master' of github.com:lifo/docrailsGrant McLean2012-03-101-2/+1
| |\ \ \
| | * | | Fix layout method doc formattingAlexey Vakhov2012-03-101-2/+1
| | | | |
| * | | | fix fragment portion of some linksGrant McLean2012-03-102-3/+3
| |/ / /
| * | / Fix 'Security#Mass Assignment' URL typoAbe Voelker2012-03-091-1/+1
| | |/ | |/|
| * | Fix comment about layout folders lookupAlexey Vakhov2012-03-091-2/+2
| | |
| * | Document validations and callbacks Array support for :if and :unless optionsJoão Britto2012-03-091-2/+16
| | |
| * | Close string quotesJoão Britto2012-03-091-1/+1
| |/
| * Additional preamble comments in form_helper.rb.Mark Thomson2012-03-081-7/+18
| |
| * Small correction to the description of the role of the form builder.Mark Thomson2012-03-081-1/+1
| | | | | | | | (endpoints are generated by form_for without reference to the form builder)
* | Merge pull request #5414 from nashby/select-hidden-inputPiotr Sarnacki2012-03-134-1/+14
|\ \ | | | | | | add 'include_hidden' option to select tag, closes #5402
| * | add 'include_hidden' option to select tag, closes #5402Vasiliy Ermolovich2012-03-134-1/+14
| | |
* | | Merge pull request #5416 from kennyj/fix_5399Aaron Patterson2012-03-132-2/+8
|\ \ \ | |/ / |/| | Fix GH #5399. connection_pools's keys are ActiveRecord::Base::ConnectionSpecification objects.
| * | Fix GH #5399. connection_pools's keys are ↵kennyj2012-03-142-2/+8
|/ / | | | | | | ActiveRecord::Base::ConnectionSpecification objects.
* | Merge pull request #5397 from rafaelfranca/fix-scaffoldJosé Valim2012-03-134-4/+52
|\ \ | | | | | | Do not use the attributes hash in the scaffold functional tests
| * | Use the attributes hash explicitlyRafael Mendonça França2012-03-134-12/+44
| | |
| * | Do not use the attributes hash in the scaffold functional testsRafael Mendonça França2012-03-124-4/+20
| | |
* | | Actually commit the change!David Heinemeier Hansson2012-03-131-1/+0
| | |
* | | Undo unwarranted change to coding conventions. I am not a fan of the ↵David Heinemeier Hansson2012-03-131-0/+1
| | | | | | | | | | | | aesthetics of private/public at the root but more importantly, we should not be changing coding conventions with almost a decades worth of history at a whim. The conventions are there to have a consistent coding style, that is their primary purpose. When there is so much existing code with the existing style, any change will have to lift an enormous burden of proof as to why its overwhelmingly superior. That is not the case here, so this is being reverted.
* | | Merge pull request #5406 from parndt/fix_issue_5193_in_masterJosé Valim2012-03-131-0/+5
|\ \ \ | | | | | | | | Fix issue #5193 in master
| * | | Fixed problem when fixture_path is not always defined (incidentally, only ↵Philip Arndt2012-03-131-1/+3
| | | | | | | | | | | | | | | | when ActiveRecord is according to test_help.rb).
| * | | Fixes issue #5193 using the instructions provided in the issue.Philip Arndt2012-03-131-0/+3
| | | |
* | | | Merge pull request #5407 from homakov/patch-1Santiago Pastorino2012-03-131-2/+2
|\ \ \ \ | |/ / / |/| | | 'module' is reserved word. Sample of code with error - not cool.
| * | | 'module' is reserved word. Sample of code with error - not cool.Egor Homakov2012-03-131-2/+2
|/ / /
* | | Merge pull request #5404 from MarkMT/masterJosé Valim2012-03-131-2/+6
|\ \ \ | | | | | | | | Updated description of #retrieve_collector_from_mimes
| * | | Updated description of #retrieve_collector_from_mimesMark Thomson2012-03-131-2/+6
|/ / /
* | | use AS::Logger so we are consistentAaron Patterson2012-03-121-1/+1
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 13:33:27 +0000