aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | 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
| | |\ \ \ \
| | * | | | | Change one more place for JSON string to HashRobert Ross2011-10-041-1/+1
| | | | | | |
| | * | | | | Fix as_json doc to say what it actually returns.Robert Ross2011-10-041-1/+1
| | | | | | |
| * | | | | | s/help/helper/Manuel Menezes de Sequeira2011-10-051-1/+1
| | |/ / / / | |/| | | |
| * | | | | [engines guide] initial layoutRyan Bigg2011-10-051-0/+36
| |/ / / /
| * | | | More corrections and clarifications to the Active Record Validations and ↵Manuel Menezes de Sequeira2011-10-041-39/+52
| | | | | | | | | | | | | | | | | | | | Callbacks guide.
| * | | | Several small corrections and clarifications to the Active Record ↵Manuel Menezes de Sequeira2011-10-031-16/+18
| | | | | | | | | | | | | | | | | | | | Validations and Callbacks guide.
| * | | | Several small corrections and improvements to the Migrations and Active ↵Manuel Menezes de Sequeira2011-10-032-60/+59
| | | | | | | | | | | | | | | | | | | | Record Basics guides.
| * | | | missed underscore in AV::TestCase helper_method documentationAlexey Vakhov2011-10-031-1/+1
| | | | |
| * | | | Several other small corrections.Manuel Menezes de Sequeira2011-10-011-30/+31
| | | | |
| * | | | Several small corrections and clarifications.Manuel Menezes de Sequeira2011-10-011-29/+31
| | | | |
| * | | | Small typo corrected.Manuel Menezes de Sequeira2011-09-301-3/+3
| | | | |
| * | | | Class name specified in example is Person, not AttributePerson.Uģis Ozols2011-09-291-3/+3
| | | | |
| * | | | Corrected a typo.Michael Hutchinson2011-09-271-1/+1
| | | | |
| * | | | Make case in configuration document consistentJustin Leitgeb2011-09-271-9/+9
| | | | |
* | | | | Merge pull request #3229 from amatsuda/string_prependJosé Valim2011-10-051-11/+13
|\ \ \ \ \ | | | | | | | | | | | | ruby193: String#prepend
| * | | | | ruby193: String#prepend is also unsafeAkira Matsuda2011-10-051-1/+1
| | | | | |
| * | | | | override unsafe methods only if defined on StringAkira Matsuda2011-10-051-10/+12
| | | | | |
* | | | | | Fix regression when calling helpers inside sprockets.José Valim2011-10-055-10/+11
|/ / / / /
* | | | | Fix the lame config.action_controller.present? check scattered throughout ↵José Valim2011-10-057-30/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | assets_path. Conflicts: actionpack/test/template/sprockets_helper_test.rb
* | | | | Raise error on unknown primary key.Jon Leighton2011-10-0512-18/+54
| | | | | | | | | | | | | | | | | | | | | | | | | If we don't have a primary key when we ask for it, it's better to fail fast. Fixes GH #2307.
* | | | | Ensure default_asset_host_protocol is respected, closes #2980.José Valim2011-10-054-8/+10
| | | | |
* | | | | Encapsulate common rake invocation logic in a method.José Valim2011-10-051-17/+14
| | | | | | | | | | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | | | | added comment about why nondigest assets requires a reinvocationMark J. Titorenko2011-10-051-0/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | | | | only reinvoke if necessaryMark J. Titorenko2011-10-051-2/+16
| | | | | | | | | | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>