Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3254 from arunagw/app_gitignore_sqlnet_log | Santiago Pastorino | 2011-10-08 | 1 | -0/+1 |
|\ | | | | | Sqlnet should also be ignored into the app gitignore | ||||
| * | Sqlnet should also be ignored into the app gitignore | Arun Agrawal | 2011-10-08 | 1 | -0/+1 |
|/ | |||||
* | Merge pull request #3249 from arunagw/query_cache_test_fix | José Valim | 2011-10-08 | 1 | -1/+1 |
|\ | | | | | Fixed BodyProxy.new for tests! for wrong argument | ||||
| * | Fixed BodyProxy.new for tests! for wrong argument | Arun Agrawal | 2011-10-08 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #3250 from arunagw/adding_sqlnet_to_gitignore | José Valim | 2011-10-08 | 1 | -0/+1 |
|\ \ | | | | | | | sqlnet.log file to gitignore. Generates when running with oracle! | ||||
| * | | sqlnet.log file to gitignore. Generates when running with oracle! | Arun Agrawal | 2011-10-08 | 1 | -0/+1 |
| |/ | |||||
* | | Merge pull request #3252 from avakhov/p-remove-expire_page-dup | José Valim | 2011-10-08 | 1 | -1/+1 |
|\ \ | |/ |/| | Remove unnecessary dup in expire_page | ||||
| * | Remove unnecessary dup in expire_page | Alexey Vakhov | 2011-10-08 | 1 | -1/+1 |
|/ | |||||
* | just check to see that the first item in the list is an array | Aaron Patterson | 2011-10-07 | 2 | -1/+10 |
| | |||||
* | fix bad formatting in the assets guide | Vijay Dev | 2011-10-08 | 1 | -1/+1 |
| | |||||
* | testing.rake should set the default task, closes #2564 | José Valim | 2011-10-07 | 2 | -2/+2 |
| | |||||
* | closes #3241 - partial doc fix | Vijay Dev | 2011-10-07 | 2 | -3/+3 |
| | |||||
* | Merge pull request #3244 from ugisozols/master | Vijay Dev | 2011-10-07 | 1 | -1/+1 |
|\ | | | | | One of the activemodel naming tests wasn't asserting anything. | ||||
| * | One of the activemodel naming tests wasn't asserting anything. | Uģis Ozols | 2011-10-07 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-10-07 | 10 | -43/+103 |
|\ \ | |/ |/| | |||||
| * | use https for github url | Vijay Dev | 2011-10-07 | 1 | -1/+1 |
| | | |||||
| * | Correct formatting | mhutchin | 2011-10-07 | 1 | -5/+1 |
| | | |||||
| * | Replace the reference to the annotate_models plugin (unchanged since 2008) ↵ | mhutchin | 2011-10-07 | 1 | -1/+5 |
| | | | | | | | | with more current annotate_models gem | ||||
| * | More understandable warning in the local_constant_names section | Dimitar Dimitrov | 2011-10-07 | 1 | -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 pipeline | clay shentrup | 2011-10-06 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' of github.com:lifo/docrails | Manuel Menezes de Sequeira | 2011-10-06 | 6 | -9/+65 |
| |\ | |||||
| | * | fix an example | Vijay Dev | 2011-10-06 | 1 | -1/+1 |
| | | | |||||
| | * | Fix comment in AbstractController callbacks | Alexey Vakhov | 2011-10-06 | 1 | -2/+2 |
| | | | |||||
| | * | Grammar fixes for the routing guide. | Hendy Tanata | 2011-10-06 | 1 | -1/+1 |
| | | | |||||
| | * | Merge branch 'master' of github.com:lifo/docrails | Ryan Bigg | 2011-10-06 | 1 | -1/+1 |
| | |\ | | | | | | | | | | | | | | | | | * 'master' of github.com:lifo/docrails: use Rails.root.join for assets guide | ||||
| | | * | use Rails.root.join for assets guide | Nick Quaranto | 2011-10-05 | 1 | -1/+1 |
| | | | | |||||
| | * | | [config guide] Show example of defining initialization hooks | Ryan Bigg | 2011-10-06 | 1 | -0/+19 |
| | | | | |||||
| | * | | [config guide] mention that to_prepare hooks are called upon every request ↵ | Ryan Bigg | 2011-10-06 | 1 | -1/+1 |
| | |/ | | | | | | | | | | in dev, but only once in production | ||||
| | * | [engines guide] More explanation for 'Generating an engine' | Ryan Bigg | 2011-10-06 | 1 | -2/+20 |
| | | | |||||
| | * | [engines] Expanded 'What are engines?' and 'Generating an engine' sections | Ryan Bigg | 2011-10-06 | 1 | -2/+21 |
| | | | |||||
| * | | Undid previous change which violated the convention regarding output (use "# ↵ | Manuel Menezes de Sequeira | 2011-10-06 | 1 | -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 Sequeira | 2011-10-05 | 1 | -30/+32 |
| | | |||||
| * | Merge branch 'master' of github.com:lifo/docrails | Manuel Menezes de Sequeira | 2011-10-05 | 75 | -247/+677 |
| |\ | |||||
| | * | Update Rails routing guide to mention that `redirect()` is a 301 permanent ↵ | Prem Sichanugrist | 2011-10-05 | 1 | -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 Sequeira | 2011-10-05 | 1 | -2/+2 |
| | | | |||||
* | | | 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 |
|\ \ \ \ \ |