aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make utf8 enforcer param customizeableDavid Lee2011-06-115-5/+36
|
* There are no snowmen hereDavid Lee2011-06-113-7/+7
|
* Revert "Make sure that we don't perform in-place mutation on SafeBuffer string"Santiago Pastorino and José Ignacio Costa2011-06-102-8/+0
| | | | This reverts commit 115e80dccc65c3ed9a9750649d9ca4ea2a7e64f1.
* Merge pull request #1644 from smartinez87/warnsSantiago Pastorino2011-06-101-1/+1
|\ | | | | Remove unused variable causing warning in 1.9.3
| * Remove unused variable causing warning in 1.9.3Sebastian Martinez2011-06-101-1/+1
| |
* | Merge pull request #1642 from sikachu/master-render-inlineAaron Patterson2011-06-103-21/+31
|\ \ | | | | | | Render inline fix for master
| * | Make sure that we don't perform in-place mutation on SafeBuffer stringPrem Sichanugrist2011-06-102-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 Sichanugrist2011-06-101-21/+23
| | |
* | | s/Bundle/Bundler/Xavier Noria2011-06-111-1/+1
| | |
* | | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-06-1110-124/+30
|\ \ \ | |/ / |/| |
| * | Fixed minor typo: 'Arraw' to 'Array'thoefer2011-06-111-1/+1
| | |
| * | shallow_path example updatedganesh2011-06-101-3/+3
| | |
| * | update palmist link on performance_testingJohn Hinnegan2011-06-091-1/+1
| | |
| * | Merge branch 'master' of github.com:lifo/docrailsMohammad Typaldos2011-06-091-1/+1
| |\ \
| | * | Describe the user name 'variable' in a way that doesn't confuse the textile ↵Ben Orenstein2011-06-081-1/+1
| | | | | | | | | | | | | | | | parser.
| * | | Match tone already establishedMohammad Typaldos2011-06-091-1/+1
| |/ /
| * | require_tree is pretty simpleMohammad Typaldos2011-06-081-2/+2
| | |
| * | Added acronym and reference link for Model–view–controllerBratish Goswami2011-06-081-1/+1
| | |
| * | minor corrections in configuring guideVijay Dev2011-06-081-11/+11
| | |
| * | remove generators section from command line guide in favor of the separate ↵Vijay Dev2011-06-081-94/+0
| | | | | | | | | | | | generator guide
| * | fix generators guide urlVijay Dev2011-06-081-2/+2
| | |
| * | use git: rather than https: in git remote urls; else, github asks for ↵Vijay Dev2011-06-081-1/+1
| | | | | | | | | | | | passwords everytime we push
| * | minor fixes from 5acf76dVijay Dev2011-06-081-2/+2
| | |
| * | fix incorrect validation examplesVijay Dev2011-06-081-5/+5
| | |
| * | Merge branch 'master' of github.com:lifo/docrailsXavier Noria2011-06-081-1/+1
| |\ \
| | * | fix typoVijay Dev2011-06-081-1/+1
| | | |
* | | | shell out to run bundler on app generation, see rationale in the commentXavier Noria2011-06-101-6/+12
| | | |
* | | | Merge pull request #1631 from vijaydev/runner-helpJosé Valim2011-06-102-0/+8
|\ \ \ \ | | | | | | | | | | rails runner without any options should show usage information
| * | | | make 'rails runner' show usage when run without any optionsVijay Dev2011-06-102-0/+8
|/ / / /
* | | | Merge pull request #1567 from BDQ/engine_migrationsJosé Valim2011-06-102-5/+12
|\ \ \ \ | | | | | | | | | | Ensure engine migrations are copied in correct sequence
| * | | | Updated test to ensure correct sequence when copying engine/plugin migrations.Brian Quinn2011-06-101-4/+11
| | | | |
| * | | | Ensure engine migrations are copied in the same sequence that they are required.Brian Quinn2011-06-101-1/+1
|/ / / /
* | | | Ensure number helpers can handle HTML safe strings - closes #1597.Andrew White2011-06-102-1/+8
| | | |
* | | | Merge pull request #1523 from raghunadhd/refactor_regexXavier Noria2011-06-101-4/+7
|\ \ \ \ | | | | | | | | | | rafactored the regex related code in the mapper class
| * | | | removed the unnecessary back slashes from the regular expressionRaghunadh2011-06-101-2/+2
| | | | |
| * | | | rafactored the regex related code in the mapper class Raghunadh2011-06-071-4/+7
| | | | |
* | | | | Merge pull request #1625 from neerajdotname/page_cachingJosé Valim2011-06-102-2/+3
|\ \ \ \ \ | | | | | | | | | | | | Three minor fixes to tests
| * | | | | add missing ensureNeeraj Singh2011-06-101-0/+1
| | | | | |
| * | | | | replaced and with && as per coding guidelinesNeeraj Singh2011-06-101-1/+1
| | | | | |
| * | | | | The test name is misleading. It saysNeeraj Singh2011-06-101-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 Patterson2011-06-092-1/+12
| | | | | | | | | | | | | | | | | | | | string
* | | | | don't reinitialize the arel_table unless the table_name changesDamien Mathieu2011-06-091-1/+2
| | | | |
* | | | | Fix issue #1598 by adding a dependency to the RDoc gem.Jacob Poulsgaard Tjoernholm2011-06-091-0/+1
| | | | |
* | | | | Print out information about whether the identity map is on or off when ↵Jon Leighton2011-06-093-6/+14
| | | | | | | | | | | | | | | | | | | | running unit tests
* | | | | Update the RUNNING_UNIT_TESTS fileJon Leighton2011-06-091-10/+5
| | | | |
* | | | | Merge pull request #1609 from sikachu/master-javascriptAaron Patterson2011-06-093-1/+6
|\ \ \ \ \ | | | | | | | | | | | | Make sure `escape_javascript` return `SafeBuffer` if the incoming argumen
| * | | | | Make sure `escape_javascript` return `SafeBuffer` if the incoming argument ↵Prem Sichanugrist2011-06-093-1/+6
|/ / / / / | | | | | | | | | | | | | | | is already html_safe
* | | | | Merge pull request #1606 from neerajdotname/remove_users_controller_from_testJosé Valim2011-06-091-3/+0
|\ \ \ \ \ | | | | | | | | | | | | remove unused UserController from test
| * | | | | remove unused user_controller from testNeeraj Singh2011-06-081-3/+0
| | |_|_|/ | |/| | |
* | | | | Merge pull request #1356 from flippingbits/fix_engine_generatorJosé Valim2011-06-0918-50/+209
|\ \ \ \ \ | | | | | | | | | | | | Fix engine's generator