aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 elucid...Michael de Silva2012-03-112-0/+17
| * attr_accessor_with_default was deprecated and removed. Andrew France2012-03-111-49/+0
| * Revised explanation of fields_for usage.Mark Thomson2012-03-111-10/+39
| * added clarification stating the counter_cache attribute needs to be created o...Michael de Silva2012-03-111-1/+3
| * 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
* | | Squash commits into a single commitAvi Tzurel2012-03-111-0/+2
|/ /
* | 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
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-0911-30/+81
|\
| * Revert "Add rails glossary of common terms & concepts"Vijay Dev2012-03-082-428/+0
| * copy edits [ci skip]Vijay Dev2012-03-071-2/+2
| * Merge pull request #88 from kevingriffin/masterVijay Dev2012-03-071-5/+5
| |\
| | * Correct it's/its usage.Kevin Griffin2012-03-061-5/+5
| * | Improve docs for attr_accessible|protected related to Hash#except|sliceCarlos Antonio da Silva2012-03-061-8/+10
| * | Add some docs for ActionController::Base.without_modulesCarlos Antonio da Silva2012-03-061-0/+10
| * | Left off a : when specifying the :namespace option for a :controllercoreyhaines2012-03-061-1/+1
| * | In a nested resource route, the parent resource param is <resource_name>_idcoreyhaines2012-03-061-8/+8
| |/
| * Merge pull request #86 from bschaeffer/ar-doc-fixVijay Dev2012-03-061-2/+2
| |\
| | * Fix doc examples for has_and_belongs_to_many associationBraden Schaeffer2012-03-051-2/+2
| * | Fix typo in isolated engine docsCaius Durling2012-03-061-1/+1
| * | [instrumentation guide] Add introduction + basic outlineRyan Bigg2012-03-051-0/+39
| * | Merge branch 'master' of github.com:lifo/docrailsadman652012-03-051-1/+1
| |\ \
| | * | Fix typo in asset pipeline guideMatthew Conway2012-03-051-1/+1
| | |/
| * / Add rails glossary of common terms & conceptsadman652012-03-052-0/+428
| |/
| * Fixed a slightly misleading equivalent SQL code on the 3.2 query interface.Swanand Pagnis2012-03-051-1/+1
| * Bump "latest version" from 3.2.1 to 3.2.2 in upgrading rails guideCarlos Antonio da Silva2012-03-041-2/+2
| * typoMikhail Dieterle2012-03-041-1/+1
* | Merge pull request #5287 from nashby/hash-slice-extractAaron Patterson2012-03-082-8/+11
|\ \
| * | refactor Hash#slice and Hash#extract!Vasiliy Ermolovich2012-03-062-8/+11
* | | Merge pull request #5306 from kennyj/fix_69c7f02José Valim2012-03-082-2/+2
|\ \ \
| * | | Change the string to use in test case.kennyj2012-03-072-2/+2
* | | | Merge pull request #5336 from kennyj/fix_wrong_extensionXavier Noria2012-03-081-1/+1
|\ \ \ \
| * | | | Update CHANGELOG to fix wrong extension.kennyj2012-03-081-1/+1
|/ / / /
* | | | Merge pull request #5289 from rafaelfranca/fix-through-associationsJon Leighton2012-03-086-8/+43
|\ \ \ \
| * | | | Not need to pass join attributes to association buildRafael Mendonça França2012-03-075-16/+21