Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge branch 'master' of github.com:rails/rails | Xavier Noria | 2011-10-07 | 3 | -3/+13 | |
|\ \ \ \ \ | ||||||
| * \ \ \ \ | Merge pull request #3243 from mjtko/connection-pool-thread-fix | Santiago Pastorino | 2011-10-07 | 3 | -3/+13 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | QueryCache/ConnectionPool thread fix (was #1670) | |||||
| | * | | | | | use thread locals and an instance variable within QueryCache#BodyProxy to ↵ | Mark J. Titorenko | 2011-10-07 | 3 | -3/+13 | |
| |/ / / / / | | | | | | | | | | | | | | | | | | | maintain appropriate linkage with AR database connection across threads | |||||
* / / / / / | asset pipeline guide: removes Apache config for serving pre-compressed ↵ | Xavier Noria | 2011-10-07 | 1 | -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_statements | Aaron Patterson | 2011-10-06 | 2 | -3/+23 | |
|\ \ \ \ \ | | | | | | | | | | | | | Use the schema_search_path in prepared statements. | |||||
| * | | | | | refs #3232. Prepared statements and postgreSQL schemas. | Juan M. Cuello | 2011-10-05 | 1 | -0/+19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add tests for prepared statements with multiple schemas in postgreSQL. | |||||
| * | | | | | Use the schema_search_path in prepared statements. | Juan M. Cuello | 2011-10-05 | 1 | -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 require | Aaron Patterson | 2011-10-06 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | fix a space in the assets guide | Vijay Dev | 2011-10-06 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | revises the precompilation section of the asset pipeline guide (web server ↵ | Xavier Noria | 2011-10-06 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | configuration for gzipped assets pending) | |||||
* | | | | | | Merge pull request #3236 from yahonda/fix_test_nonexisting_method_with_arguments | José Valim | 2011-10-06 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fixed test_nonexisting_method_with_arguments to revert commit 29a5aea | |||||
| * | | | | | | Fixed test_nonexisting_method_with_arguments to revert commit 29a5aea | Yasuo Honda | 2011-10-06 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #3203 from jrmehle/fix_clone_structure | Vijay Dev | 2011-10-06 | 1 | -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 Mehle | 2011-10-03 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | Leaving the path unquoted causes errors in paths containing spaces or dashes. | |||||
* | | | | | | | Merge branch 'multiple-transactional-fixture-connections' | Jeremy Kemper | 2011-10-05 | 7 | -10/+61 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Transactional fixtures enlist all active database connections. | Jeremy Kemper | 2011-10-05 | 7 | -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é Valim | 2011-10-06 | 2 | -3/+1 | |
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | This reverts commit 29a5aeaae976bf8432d57ec996c7c81932a39de6. | |||||
* | | | | | | | Raise an exception on unknown primary key inside AssociationReflection. | Jon Leighton | 2011-10-05 | 3 | -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 Leighton | 2011-10-05 | 12 | -54/+18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ee2be435b1e5c0e94a4ee93a1a310e0471a77d07. | |||||
* | | | | | | | stylesheet_link_tag('/stylesheets/application') and similar helpers doesn't ↵ | Santiago Pastorino | 2011-10-05 | 2 | -0/+7 | |
| |/ / / / / |/| | | | | | | | | | | | | | | | | | throw Sprockets::FileOutsidePaths exception anymore | |||||
* | | | | | | Do not require railtie as it messes up Rails.application setup. | José Valim | 2011-10-05 | 1 | -2/+1 | |
| |_|/ / / |/| | | | | ||||||
* | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-10-05 | 10 | -191/+241 | |
|\ \ \ \ \ | ||||||
| * | | | | | copy editing | Vijay Dev | 2011-10-05 | 3 | -9/+6 | |
| | |/ / / | |/| | | | ||||||
| * | | | | Merge branch 'master' of github.com:lifo/docrails | Manuel Menezes de Sequeira | 2011-10-05 | 2 | -4/+4 | |
| |\ \ \ \ | ||||||
| | * | | | | Corrections to Active Record Validations and Callbacks guide. | Hendy Tanata | 2011-10-05 | 1 | -3/+3 | |
| | | | | | | ||||||
| | * | | | | Merge branch 'master' of github.com:lifo/docrails | Robert Ross | 2011-10-04 | 1 | -0/+36 | |
| | |\ \ \ \ | ||||||
| | * | | | | | Change one more place for JSON string to Hash | Robert Ross | 2011-10-04 | 1 | -1/+1 | |
| | | | | | | | ||||||
| | * | | | | | Fix as_json doc to say what it actually returns. | Robert Ross | 2011-10-04 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | s/help/helper/ | Manuel Menezes de Sequeira | 2011-10-05 | 1 | -1/+1 | |
| | |/ / / / | |/| | | | | ||||||
| * | | | | | [engines guide] initial layout | Ryan Bigg | 2011-10-05 | 1 | -0/+36 | |
| |/ / / / | ||||||
| * | | | | More corrections and clarifications to the Active Record Validations and ↵ | Manuel Menezes de Sequeira | 2011-10-04 | 1 | -39/+52 | |
| | | | | | | | | | | | | | | | | | | | | Callbacks guide. | |||||
| * | | | | Several small corrections and clarifications to the Active Record ↵ | Manuel Menezes de Sequeira | 2011-10-03 | 1 | -16/+18 | |
| | | | | | | | | | | | | | | | | | | | | Validations and Callbacks guide. | |||||
| * | | | | Several small corrections and improvements to the Migrations and Active ↵ | Manuel Menezes de Sequeira | 2011-10-03 | 2 | -60/+59 | |
| | | | | | | | | | | | | | | | | | | | | Record Basics guides. | |||||
| * | | | | missed underscore in AV::TestCase helper_method documentation | Alexey Vakhov | 2011-10-03 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Several other small corrections. | Manuel Menezes de Sequeira | 2011-10-01 | 1 | -30/+31 | |
| | | | | | ||||||
| * | | | | Several small corrections and clarifications. | Manuel Menezes de Sequeira | 2011-10-01 | 1 | -29/+31 | |
| | | | | | ||||||
| * | | | | Small typo corrected. | Manuel Menezes de Sequeira | 2011-09-30 | 1 | -3/+3 | |
| | | | | | ||||||
| * | | | | Class name specified in example is Person, not AttributePerson. | Uģis Ozols | 2011-09-29 | 1 | -3/+3 | |
| | | | | | ||||||
| * | | | | Corrected a typo. | Michael Hutchinson | 2011-09-27 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Make case in configuration document consistent | Justin Leitgeb | 2011-09-27 | 1 | -9/+9 | |
| | | | | | ||||||
* | | | | | Merge pull request #3229 from amatsuda/string_prepend | José Valim | 2011-10-05 | 1 | -11/+13 | |
|\ \ \ \ \ | | | | | | | | | | | | | ruby193: String#prepend | |||||
| * | | | | | ruby193: String#prepend is also unsafe | Akira Matsuda | 2011-10-05 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | override unsafe methods only if defined on String | Akira Matsuda | 2011-10-05 | 1 | -10/+12 | |
| | | | | | | ||||||
* | | | | | | Fix regression when calling helpers inside sprockets. | José Valim | 2011-10-05 | 5 | -10/+11 | |
|/ / / / / | ||||||
* | | | | | Fix the lame config.action_controller.present? check scattered throughout ↵ | José Valim | 2011-10-05 | 7 | -30/+32 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | assets_path. Conflicts: actionpack/test/template/sprockets_helper_test.rb | |||||
* | | | | | Raise error on unknown primary key. | Jon Leighton | 2011-10-05 | 12 | -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é Valim | 2011-10-05 | 4 | -8/+10 | |
| | | | | | ||||||
* | | | | | Encapsulate common rake invocation logic in a method. | José Valim | 2011-10-05 | 1 | -17/+14 | |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | | | | | added comment about why nondigest assets requires a reinvocation | Mark J. Titorenko | 2011-10-05 | 1 | -0/+5 | |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | | | | | only reinvoke if necessary | Mark J. Titorenko | 2011-10-05 | 1 | -2/+16 | |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> |