Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Don't wrap operations on collection associations in transactions when they ↵ | benedikt | 2011-06-12 | 2 | -3/+54 |
| | | | | are not needed, so the connection adapter does not send empty BEGIN COMMIT transactions blocks to the database. | ||||
* | Define ActiveSupport#to_param as to_str - closes #1663 | Andrew White | 2011-06-12 | 3 | -1/+19 |
| | |||||
* | Merge branch 'master' of github.com:rails/rails | Xavier Noria | 2011-06-12 | 1 | -3/+3 |
|\ | |||||
| * | Make i18n tests more robust. | José Valim | 2011-06-12 | 1 | -3/+3 |
| | | |||||
* | | backslash insertion for RDoc main page ignores code blocks, also adds ↵ | Xavier Noria | 2011-06-12 | 1 | -1/+19 |
|/ | | | | comments to explain what's this hack about | ||||
* | revises the pattern that excludes generator templates in API generation | Xavier Noria | 2011-06-12 | 1 | -1/+1 |
| | | | | | | | | With the previous pattern RDoc processed railties/lib/rails/generators/rails/plugin_new/templates/test/%name%_test.rb and that resulted in a spurious "<" class. | ||||
* | Update changelog with #1552 feature: add hidden field before ↵ | Piotr Sarnacki | 2011-06-11 | 1 | -0/+5 |
| | | | | select[multiple=true] | ||||
* | Update CHANGELOG. | José Valim | 2011-06-11 | 1 | -0/+3 |
| | |||||
* | Get rid of the alternate namespace lookup. | José Valim | 2011-06-11 | 3 | -17/+5 |
| | |||||
* | Merge pull request #1552 from bogdan/select | Piotr Sarnacki | 2011-06-11 | 2 | -8/+55 |
|\ | | | | | Fixing select[multiple] html specification problem. | ||||
| * | Fixing select[multiple] html specification problem. | Bogdan Gusiev | 2011-06-08 | 2 | -8/+55 |
| | | | | | | | | Generating hidden input with same name before each multiple select | ||||
* | | No need for a configuration option here. | José Valim | 2011-06-11 | 1 | -10/+2 |
| | | |||||
* | | Merge pull request #549 from dlee/utf8_enforcer | José Valim | 2011-06-11 | 5 | -10/+21 |
|\ \ | | | | | | | Utf8 enforcer param customization | ||||
| * | | Remove utf8_enforcer_param config option | David Lee | 2011-06-11 | 3 | -24/+0 |
| | | | |||||
| * | | Make utf8_enforcer_tag an overrideable method | David Lee | 2011-06-11 | 1 | -3/+7 |
| | | | |||||
| * | | Make utf8 enforcer param customizeable | David Lee | 2011-06-11 | 5 | -5/+36 |
| | | | |||||
| * | | There are no snowmen here | David Lee | 2011-06-11 | 3 | -7/+7 |
| | | | |||||
* | | | Merge pull request #1647 from neerajdotname/make_tests_stronger | José Valim | 2011-06-11 | 3 | -5/+4 |
|\ \ \ | |/ / |/| | | Make tests stronger, cleaner and slimmer | ||||
| * | | remove meaningless assert true | Neeraj Singh | 2011-06-11 | 1 | -1/+0 |
| | | | |||||
| * | | expected message should come first | Neeraj Singh | 2011-06-11 | 1 | -2/+2 |
| | | | |||||
| * | | try not to use assert_blank when nil will would | Neeraj Singh | 2011-06-11 | 1 | -2/+2 |
|/ / | | | | | | | | | | | be considered as failure Test for specific value to the extent possible | ||||
* | | Revert "Make sure that we don't perform in-place mutation on SafeBuffer string" | Santiago Pastorino and José Ignacio Costa | 2011-06-10 | 2 | -8/+0 |
| | | | | | | | | This reverts commit 115e80dccc65c3ed9a9750649d9ca4ea2a7e64f1. | ||||
* | | Merge pull request #1644 from smartinez87/warns | Santiago Pastorino | 2011-06-10 | 1 | -1/+1 |
|\ \ | | | | | | | Remove unused variable causing warning in 1.9.3 | ||||
| * | | Remove unused variable causing warning in 1.9.3 | Sebastian Martinez | 2011-06-10 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #1642 from sikachu/master-render-inline | Aaron Patterson | 2011-06-10 | 3 | -21/+31 |
|\ \ \ | | | | | | | | | Render inline fix for master | ||||
| * | | | Make sure that we don't perform in-place mutation on SafeBuffer string | Prem Sichanugrist | 2011-06-10 | 2 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | This will make sure `render :inline` is working. Closes #1633 | ||||
| * | | | Update CHANGELOG to mention the json_escape change, and rearrange stuff a bit. | Prem Sichanugrist | 2011-06-10 | 1 | -21/+23 |
| | | | | |||||
* | | | | s/Bundle/Bundler/ | Xavier Noria | 2011-06-11 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-06-11 | 10 | -124/+30 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Fixed minor typo: 'Arraw' to 'Array' | thoefer | 2011-06-11 | 1 | -1/+1 |
| | | | | |||||
| * | | | shallow_path example updated | ganesh | 2011-06-10 | 1 | -3/+3 |
| | | | | |||||
| * | | | update palmist link on performance_testing | John Hinnegan | 2011-06-09 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'master' of github.com:lifo/docrails | Mohammad Typaldos | 2011-06-09 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | Describe the user name 'variable' in a way that doesn't confuse the textile ↵ | Ben Orenstein | 2011-06-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | parser. | ||||
| * | | | | Match tone already established | Mohammad Typaldos | 2011-06-09 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | require_tree is pretty simple | Mohammad Typaldos | 2011-06-08 | 1 | -2/+2 |
| | | | | |||||
| * | | | Added acronym and reference link for Model–view–controller | Bratish Goswami | 2011-06-08 | 1 | -1/+1 |
| | | | | |||||
| * | | | minor corrections in configuring guide | Vijay Dev | 2011-06-08 | 1 | -11/+11 |
| | | | | |||||
| * | | | remove generators section from command line guide in favor of the separate ↵ | Vijay Dev | 2011-06-08 | 1 | -94/+0 |
| | | | | | | | | | | | | | | | | generator guide | ||||
| * | | | fix generators guide url | Vijay Dev | 2011-06-08 | 1 | -2/+2 |
| | | | | |||||
| * | | | use git: rather than https: in git remote urls; else, github asks for ↵ | Vijay Dev | 2011-06-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | passwords everytime we push | ||||
| * | | | minor fixes from 5acf76d | Vijay Dev | 2011-06-08 | 1 | -2/+2 |
| | | | | |||||
| * | | | fix incorrect validation examples | Vijay Dev | 2011-06-08 | 1 | -5/+5 |
| | | | | |||||
| * | | | Merge branch 'master' of github.com:lifo/docrails | Xavier Noria | 2011-06-08 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | fix typo | Vijay Dev | 2011-06-08 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | shell out to run bundler on app generation, see rationale in the comment | Xavier Noria | 2011-06-10 | 1 | -6/+12 |
| | | | | | |||||
* | | | | | Merge pull request #1631 from vijaydev/runner-help | José Valim | 2011-06-10 | 2 | -0/+8 |
|\ \ \ \ \ | | | | | | | | | | | | | rails runner without any options should show usage information | ||||
| * | | | | | make 'rails runner' show usage when run without any options | Vijay Dev | 2011-06-10 | 2 | -0/+8 |
|/ / / / / | |||||
* | | | | | Merge pull request #1567 from BDQ/engine_migrations | José Valim | 2011-06-10 | 2 | -5/+12 |
|\ \ \ \ \ | | | | | | | | | | | | | Ensure engine migrations are copied in correct sequence | ||||
| * | | | | | Updated test to ensure correct sequence when copying engine/plugin migrations. | Brian Quinn | 2011-06-10 | 1 | -4/+11 |
| | | | | | |