aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* removed the link to my blog to help stop endless commentsJoost Baaij2011-08-231-1/+1
* Revert "Removed my name from the changelog as the amount of blogspam became r...Joost Baaij2011-08-231-0/+1
* Removed my name from the changelog as the amount of blogspam became ridiculous. Joost Baaij2011-08-221-1/+0
* Merge pull request #2596 from dharmatech/patch-1Santiago Pastorino2011-08-201-1/+1
|\
| * ActionController::Redirecting : fix docs typodharmatech2011-08-201-1/+1
* | Merge pull request #2595 from smartinez87/assets-guideSantiago Pastorino2011-08-201-0/+2
|\ \
| * | Document debugging assets set by default for dev and test envs in the asset_p...Sebastian Martinez2011-08-191-0/+2
| |/
* | Merge pull request #2597 from dharmatech/patch-2Santiago Pastorino2011-08-201-1/+1
|\ \
| * | actionpack/lib/action_controller/base.rb: docs typodharmatech2011-08-201-1/+1
| |/
* | Merge pull request #2604 from vijaydev/params_wrapper_docsSantiago Pastorino2011-08-201-4/+3
|\ \
| * | params wrapper docs correctionVijay Dev2011-08-211-4/+3
| |/
* | Merge pull request #2602 from ernie/fix_predicate_builder_primary_key_assumptionAaron Patterson2011-08-202-1/+24
|\ \
| * | Fix PredicateBuilder clobbering select_values in subquery.Ernie Miller2011-08-202-1/+14
| * | Fix assumption of primary key name in PredicateBuilder subquery.Ernie Miller2011-08-202-1/+11
| |/
* | Merge pull request #2603 from vijaydev/guidesSantiago Pastorino2011-08-201-1/+1
|\ \ | |/ |/|
| * minor change in the 3.1 release notesVijay Dev2011-08-201-1/+1
|/
* Merge pull request #2581 from guilleiguaran/debug-assets-in-devSantiago Pastorino2011-08-192-8/+24
|\
| * Debug assets by default in development and test environmentsGuillermo Iguaran2011-08-182-8/+24
* | Merge pull request #2589 from vijaydev/guidesXavier Noria2011-08-191-31/+26
|\ \ | |/ |/|
| * mailer guide: fixes indentation, and use fixed width fonts wherever necessaryVijay Dev2011-08-201-31/+26
|/
* minor details revised in a gsubXavier Noria2011-08-181-1/+1
* Merge branch 'master' of https://github.com/lifo/docrailsXavier Noria2011-08-1715-26/+5
|\
| * Updates to remove extra whitespaces and notably fix a whitespace issue with a...Jeff Dutil2011-08-1610-22/+1
| * Fix typo in i18n.textile header and remove extra whitespace.Jeff Dutil2011-08-161-2/+1
| * Fix ruby typo to correctly render code block in initializer.textileJeff Dutil2011-08-162-2/+2
| * Fix spacing in plugins.textile to fix html rendering and remove extra whitesp...Jeff Dutil2011-08-162-1/+2
* | fixes generation of the AR querying guideXavier Noria2011-08-171-2/+2
* | Merge pull request #2551 from rgo/remove-blank-spaces-application-cssXavier Noria2011-08-171-3/+3
|\ \
| * | Cleanup application.cssRafa García2011-08-171-3/+3
|/ /
* | making the order more clear, adding linux distros mailing lists to our ccAaron Patterson2011-08-161-10/+13
* | adding lessons learned so I do not make the same mistake twiceAaron Patterson2011-08-161-0/+5
* | Properly escape glob characters.Aaron Patterson2011-08-163-3/+27
* | properly escape html to avoid invalid utf8 causing XSS attacksAaron Patterson2011-08-162-1/+8
* | Tags with invalid names should also be stripped in order to preventAaron Patterson2011-08-162-1/+8
* | prevent sql injection attacks by escaping quotes in column namesAaron Patterson2011-08-164-3/+20
* | adding security email addressAaron Patterson2011-08-161-2/+1
* | Merge branch 'master' of github.com:rails/railsXavier Noria2011-08-163-16/+9
|\ \
| * | Use lazy load hooks to set parameter wrapping configuration. This means that ...Jon Leighton2011-08-163-16/+9
* | | Merge branch 'master' of github.com:lifo/docrailsXavier Noria2011-08-1612-81/+124
|\ \ \ | |/ / |/| / | |/
| * Fix formatting of active_record_validations_callbacks.textile so guide will r...Jeff Dutil2011-08-161-2/+2
| * document Array#append and Array#prepend methods in AS guideVijay Dev2011-08-161-0/+24
| * Document Hash#extract!.Sebastian Martinez2011-08-152-0/+14
| * Fixed mistakes in layouts/rendering guide about yieldJacob Mattingley2011-08-151-2/+2
| * Updates to Asset Pipeline GuideJESii2011-08-151-45/+45
| * assets guide - add info about require_directory, minor rephrasingsVijay Dev2011-08-151-5/+7
| * minor changes in app templates guideVijay Dev2011-08-151-7/+1
| * Merge pull request #58 from cameel/fix-set_autoload_path-typoKamil Śliwak2011-08-141-1/+1
| |\
| | * Fix a typo in 'Configuring Rails Applications' guide Kamil Śliwak2011-08-151-1/+1
| |/
| * TypoRaul Murciano2011-08-141-1/+1
| * Action Mailer guide: mention how to use :cc and :bcc parameters.Raul Murciano2011-08-141-0/+2