aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* copy editingmhutchin2011-10-091-1/+1
| | | | "updated the ajax_on_rails.textile for rails3"
* Correct stylesheet filename and remove reference to old stylesheet ↵mhutchin2011-10-081-1/+1
| | | | compilation location
* 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) ↵mhutchin2011-10-071-1/+5
| | | | | | | | with more current annotate_models gem
| * More understandable warning in the local_constant_names section Dimitar Dimitrov2011-10-071-2/+2
| | | | | | Rewrite the warning about local_constant_names in Ruby 1.8 to make it more understandable. Word ordering fixes in the same section.
| * 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
| | |\ | | | | | | | | | | | | | | | | * 'master' of github.com:lifo/docrails: use Rails.root.join for assets guide
| | | * 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 ↵Ryan Bigg2011-10-061-1/+1
| | |/ | | | | | | | | | in dev, but only once in production
| | * [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
| |/ | | | | | | =>") used in these guides. Corrected typo in previous correction. (Thanks for pointing this out, vijaydev.)
| * 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 ↵Prem Sichanugrist2011-10-051-0/+2
| | | | | | | | | | | | | | | | | | redirect I had to try out myself to realize that it's 301, so this should be helpful to everyone.
| * | 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
| |\ \ \ | | | | | | | | | | QueryCache/ConnectionPool thread fix (was #1670)
| | * | | use thread locals and an instance variable within QueryCache#BodyProxy to ↵Mark J. Titorenko2011-10-073-3/+13
| |/ / / | | | | | | | | | | | | maintain appropriate linkage with AR database connection across threads
* / / / asset pipeline guide: removes Apache config for serving pre-compressed ↵Xavier Noria2011-10-071-21/+12
|/ / / | | | | | | | | | | | | | | | | | | | | | assets, and expands the information about nginx support for this A robust Apache configuration for this feature seems to be tricky, one that takes into account Accept-Encoding, sets Vary, ensures Content-Type is right, etc.
* | | Merge pull request #3232 from Juanmcuello/pg_prepared_statementsAaron Patterson2011-10-062-3/+23
|\ \ \ | | | | | | | | Use the schema_search_path in prepared statements.
| * | | refs #3232. Prepared statements and postgreSQL schemas.Juan M. Cuello2011-10-051-0/+19
| | | | | | | | | | | | | | | | | | | | Add tests for prepared statements with multiple schemas in postgreSQL.
| * | | Use the schema_search_path in prepared statements.Juan M. Cuello2011-10-051-3/+4
| | | | | | | | | | | | | | | | | | | | To allow the use of prepared statements when changing schemas in postgres, the schema search path is added to the sql key.
* | | | 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 ↵Xavier Noria2011-10-061-3/+3
| | | | | | | | | | | | | | | | configuration for gzipped assets pending)
* | | | 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 29a5aea
| * | | | 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
|\ \ \ \ | | | | | | | | | | db:test:clone_structure if path to .sql file contains spaces or dashes
| * | | | Quoted path to <Rails.env>_structure.sql file in db:test:clone_structure task.Jared Mehle2011-10-031-2/+2
| | | | | | | | | | | | | | | Leaving the path unquoted causes errors in paths containing spaces or dashes.
* | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | You can use multiple databases in your tests without disabling transactional fixtures.
* | | | | | Revert "don't raise NoMethodError the tried method doesn't exists"José Valim2011-10-062-3/+1
|/ / / / / | | | | | | | | | | | | | | | This reverts commit 29a5aeaae976bf8432d57ec996c7c81932a39de6.
* | | | | Raise an exception on unknown primary key inside AssociationReflection.Jon Leighton2011-10-053-4/+36
| | | | | | | | | | | | | | | | | | | | | | | | | An association between two models cannot be made if a relevant key is unknown, so fail fast rather than generating invalid SQL. Fixes #3207.
* | | | | Revert "Raise error on unknown primary key."Jon Leighton2011-10-0512-54/+18
| | | | | | | | | | | | | | | | | | | | This reverts commit ee2be435b1e5c0e94a4ee93a1a310e0471a77d07.
* | | | | stylesheet_link_tag('/stylesheets/application') and similar helpers doesn't ↵Santiago Pastorino2011-10-052-0/+7
| |/ / / |/| | | | | | | | | | | throw Sprockets::FileOutsidePaths exception anymore
* | | | 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
| | |\ \