aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* copy editingmhutchin2011-10-091-1/+1
* Correct stylesheet filename and remove reference to old stylesheet compilatio...mhutchin2011-10-081-1/+1
* Fix params hash example in AC::Base commentAlexey Vakhov2011-10-081-1/+1
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-10-0710-43/+103
|\
| * use https for github urlVijay Dev2011-10-071-1/+1
| * Correct formattingmhutchin2011-10-071-5/+1
| * Replace the reference to the annotate_models plugin (unchanged since 2008) wi...mhutchin2011-10-071-1/+5
| * More understandable warning in the local_constant_names section Dimitar Dimitrov2011-10-071-2/+2
| * Clarifying ambiguous description of require_self in the asset pipelineclay shentrup2011-10-061-1/+1
| * Merge branch 'master' of github.com:lifo/docrailsManuel Menezes de Sequeira2011-10-066-9/+65
| |\
| | * fix an exampleVijay Dev2011-10-061-1/+1
| | * Fix comment in AbstractController callbacksAlexey Vakhov2011-10-061-2/+2
| | * Grammar fixes for the routing guide.Hendy Tanata2011-10-061-1/+1
| | * Merge branch 'master' of github.com:lifo/docrailsRyan Bigg2011-10-061-1/+1
| | |\
| | | * use Rails.root.join for assets guideNick Quaranto2011-10-051-1/+1
| | * | [config guide] Show example of defining initialization hooksRyan Bigg2011-10-061-0/+19
| | * | [config guide] mention that to_prepare hooks are called upon every request in...Ryan Bigg2011-10-061-1/+1
| | |/
| | * [engines guide] More explanation for 'Generating an engine'Ryan Bigg2011-10-061-2/+20
| | * [engines] Expanded 'What are engines?' and 'Generating an engine' sectionsRyan Bigg2011-10-061-2/+21
| * | Undid previous change which violated the convention regarding output (use "# ...Manuel Menezes de Sequeira2011-10-061-13/+13
| |/
| * Some small corrections and improvements to the text.Manuel Menezes de Sequeira2011-10-051-30/+32
| * Merge branch 'master' of github.com:lifo/docrailsManuel Menezes de Sequeira2011-10-0575-247/+677
| |\
| | * Update Rails routing guide to mention that `redirect()` is a 301 permanent re...Prem Sichanugrist2011-10-051-0/+2
| * | Correction of code snippet tag from shell to ruby.Manuel Menezes de Sequeira2011-10-051-2/+2
* | | Merge branch 'master' of github.com:rails/railsXavier Noria2011-10-073-3/+13
|\ \ \
| * \ \ Merge pull request #3243 from mjtko/connection-pool-thread-fixSantiago Pastorino2011-10-073-3/+13
| |\ \ \
| | * | | use thread locals and an instance variable within QueryCache#BodyProxy to mai...Mark J. Titorenko2011-10-073-3/+13
| |/ / /
* / / / asset pipeline guide: removes Apache config for serving pre-compressed assets...Xavier Noria2011-10-071-21/+12
|/ / /
* | | Merge pull request #3232 from Juanmcuello/pg_prepared_statementsAaron Patterson2011-10-062-3/+23
|\ \ \
| * | | refs #3232. Prepared statements and postgreSQL schemas.Juan M. Cuello2011-10-051-0/+19
| * | | Use the schema_search_path in prepared statements.Juan M. Cuello2011-10-051-3/+4
* | | | fix requireAaron Patterson2011-10-061-1/+1
* | | | fix a space in the assets guideVijay Dev2011-10-061-1/+1
* | | | revises the precompilation section of the asset pipeline guide (web server co...Xavier Noria2011-10-061-3/+3
* | | | Merge pull request #3236 from yahonda/fix_test_nonexisting_method_with_argumentsJosé Valim2011-10-061-1/+1
|\ \ \ \
| * | | | Fixed test_nonexisting_method_with_arguments to revert commit 29a5aeaYasuo Honda2011-10-061-1/+1
|/ / / /
* | | | Merge pull request #3203 from jrmehle/fix_clone_structureVijay Dev2011-10-061-2/+2
|\ \ \ \
| * | | | Quoted path to <Rails.env>_structure.sql file in db:test:clone_structure task.Jared Mehle2011-10-031-2/+2
* | | | | Merge branch 'multiple-transactional-fixture-connections'Jeremy Kemper2011-10-057-10/+61
|\ \ \ \ \
| * | | | | Transactional fixtures enlist all active database connections.Jeremy Kemper2011-10-057-10/+61
* | | | | | Revert "don't raise NoMethodError the tried method doesn't exists"José Valim2011-10-062-3/+1
|/ / / / /
* | | | | Raise an exception on unknown primary key inside AssociationReflection.Jon Leighton2011-10-053-4/+36
* | | | | Revert "Raise error on unknown primary key."Jon Leighton2011-10-0512-54/+18
* | | | | stylesheet_link_tag('/stylesheets/application') and similar helpers doesn't t...Santiago Pastorino2011-10-052-0/+7
| |/ / / |/| | |
* | | | Do not require railtie as it messes up Rails.application setup.José Valim2011-10-051-2/+1
| |_|/ |/| |
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-10-0510-191/+241
|\ \ \
| * | | copy editingVijay Dev2011-10-053-9/+6
| | |/ | |/|
| * | Merge branch 'master' of github.com:lifo/docrailsManuel Menezes de Sequeira2011-10-052-4/+4
| |\ \
| | * | Corrections to Active Record Validations and Callbacks guide.Hendy Tanata2011-10-051-3/+3
| | * | Merge branch 'master' of github.com:lifo/docrailsRobert Ross2011-10-041-0/+36
| | |\ \