Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | | | |||||
| * | | | | Ensure engine migrations are copied in the same sequence that they are required. | Brian Quinn | 2011-06-10 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Ensure number helpers can handle HTML safe strings - closes #1597. | Andrew White | 2011-06-10 | 2 | -1/+8 |
| | | | | |||||
* | | | | Merge pull request #1523 from raghunadhd/refactor_regex | Xavier Noria | 2011-06-10 | 1 | -4/+7 |
|\ \ \ \ | | | | | | | | | | | rafactored the regex related code in the mapper class | ||||
| * | | | | removed the unnecessary back slashes from the regular expression | Raghunadh | 2011-06-10 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | rafactored the regex related code in the mapper class | Raghunadh | 2011-06-07 | 1 | -4/+7 |
| | | | | | |||||
* | | | | | Merge pull request #1625 from neerajdotname/page_caching | José Valim | 2011-06-10 | 2 | -2/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | Three minor fixes to tests | ||||
| * | | | | | add missing ensure | Neeraj Singh | 2011-06-10 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | replaced and with && as per coding guidelines | Neeraj Singh | 2011-06-10 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | The test name is misleading. It says | Neeraj Singh | 2011-06-10 | 1 | -1/+1 |
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test_should_cache_with_trailing_slash_on_url A trailing slash is removed when a page is cached. What the test meant to say was : a url with trailing slash should be cached and the cached page should not have any trailing slash. This patch clarifies the name a bit. | ||||
* | | | | | ensuring that json_escape returns html safe strings when passed an html safe ↵ | Aaron Patterson | 2011-06-09 | 2 | -1/+12 |
| | | | | | | | | | | | | | | | | | | | | string | ||||
* | | | | | don't reinitialize the arel_table unless the table_name changes | Damien Mathieu | 2011-06-09 | 1 | -1/+2 |
| | | | | | |||||
* | | | | | Fix issue #1598 by adding a dependency to the RDoc gem. | Jacob Poulsgaard Tjoernholm | 2011-06-09 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Print out information about whether the identity map is on or off when ↵ | Jon Leighton | 2011-06-09 | 3 | -6/+14 |
| | | | | | | | | | | | | | | | | | | | | running unit tests | ||||
* | | | | | Update the RUNNING_UNIT_TESTS file | Jon Leighton | 2011-06-09 | 1 | -10/+5 |
| | | | | | |||||
* | | | | | Merge pull request #1609 from sikachu/master-javascript | Aaron Patterson | 2011-06-09 | 3 | -1/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | Make sure `escape_javascript` return `SafeBuffer` if the incoming argumen | ||||
| * | | | | | Make sure `escape_javascript` return `SafeBuffer` if the incoming argument ↵ | Prem Sichanugrist | 2011-06-09 | 3 | -1/+6 |
|/ / / / / | | | | | | | | | | | | | | | | is already html_safe | ||||
* | | | | | Merge pull request #1606 from neerajdotname/remove_users_controller_from_test | José Valim | 2011-06-09 | 1 | -3/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | remove unused UserController from test | ||||
| * | | | | | remove unused user_controller from test | Neeraj Singh | 2011-06-08 | 1 | -3/+0 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #1356 from flippingbits/fix_engine_generator | José Valim | 2011-06-09 | 18 | -50/+209 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix engine's generator | ||||
| * | | | | | Prepend bundle exec to get the correct Rake version | Stefan Sprenger | 2011-06-07 | 1 | -3/+3 |
| | | | | | | |||||
| * | | | | | Use RAILS_ISOLATED_ENGINE and fix namespaced generators tests | Stefan Sprenger | 2011-06-07 | 4 | -12/+3 |
| | | | | | | |||||
| * | | | | | Use mattr_accessor :namespace | Stefan Sprenger | 2011-06-07 | 2 | -13/+2 |
| | | | | | |