aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [getting started] Link to Bundler website when explaining Gemfile[.lock]Ryan Bigg2012-03-141-1/+1
|
* [getting started] Improve prose for initial routing sectionRyan Bigg2012-03-141-6/+5
|
* [getting started] mention generators early on, when rails new is mentioned.Ryan Bigg2012-03-141-3/+4
| | | | This is to show one of the 'wins' of Rails nice and early. More are demonstrated as we flow through the guide.
* [getting started] briefly explain what a controller and view areRyan Bigg2012-03-141-1/+8
|
* [getting started] more line lengtheningRyan Bigg2012-03-141-63/+18
|
* [getting started] fix lines that are too short.Ryan Bigg2012-03-141-5/+1
| | | | This should be a configuration setting on your text editor, rather than hard-coded into the guide
* [getting started] update Rails version to 3.2.2Ryan Bigg2012-03-141-1/+1
|
* [getting started] *THE* way to install Rails is by running +gem install+. ↵Ryan Bigg2012-03-141-2/+1
| | | | You should not run this as the root user.
* [getting started] Remove super-early mention of REST from Getting Started guide.Ryan Bigg2012-03-141-148/+1
| | | | We will mention this as we introduce the routing components for Rails later on in the guide.
* Move database configuration section from Getting Started Guide into ↵Ryan Bigg2012-03-142-140/+93
| | | | | | Configuration guide This is because newbies don't need to know immediately all the different ways of configuring a database on Rails. The default is SQLite3 which'll work on most operating systems by default. The only reason for it to *not* work is due to missing packages on the operating system, which should be taken care of in some sort of 'Installing Rails for <Operating System> guide.
* Minor clarification in documentation language and spellingMatthew Daubert2012-03-131-4/+4
|
* 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
| | |