aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* json_escape makes json invalid doc change [#1485 state:resolved]Neeraj Singh2010-10-161-0/+6
* Revert "added ignore rule for linux temp file ending with a tilda ~"Xavier Noria2010-10-161-1/+0
* added ignore rule for linux temp file ending with a tilda ~Rajinder Yadav2010-10-151-0/+1
* Merge branch 'master' of git://github.com/lifo/docrailsRajinder Yadav2010-10-15221-2204/+3185
|\
| * remove Mongrel from debugger docsRob Zolkos2010-10-151-3/+1
| * WEBrick is the default web server, not Mongrel [#186 state:resolved]Rob Zolkos2010-10-151-1/+1
| * Fixed casing of JavaScript (and RJS) [#183 state:resolved]Neil Middleton2010-10-141-8/+8
| * Fixing a small typo in the generators guideNick Quaranto2010-10-141-1/+1
| * Use <em> rather than underscores to fix display issue with 4.1.1.1 in the ass...Ryan Bigg and Xavier Noria2010-10-141-1/+1
| * Removed miscelenous letters.Ugis Ozols2010-10-131-1/+1
| * Remove doc for debugging callbacks. Methods don't exist in Rails masterRafael Mendonça França2010-10-131-10/+0
| * Merge branch 'master' of github.com:lifo/docrailsKrekoten' Marjan2010-10-121-2/+2
| |\
| | * fix time.to_formatted_time(:time) exampleAditya Sanghi2010-10-131-2/+2
| * | Fix small typo in documentationKrekoten' Marjan2010-10-121-1/+1
| |/
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2010-10-115-9/+8
| |\
| | * Revert "Add missing CHANGELOG entry about reset_javascript_include_default"Xavier Noria2010-10-111-2/+0
| | * I corrected a code snippet typo in the railties/guides/source/initialization....Philip R. Dutton2010-10-111-1/+1
| | * Add missing CHANGELOG entry about reset_javascript_include_defaultRyan Bigg2010-10-111-0/+2
| | * Remove mention to register_javascript_include_default in documentationRyan Bigg2010-10-112-6/+0
| | * Fix typo 'configation' [#5575 state:resolved]Utkarsh Kukreti2010-10-111-1/+1
| | * Updated RUNNING_UNIT_TESTS documentation with mention of the build_databases ...Nathan Zook and Ryan Bigg2010-10-111-1/+6
| * | Updated DOCS for engines and added a couple TODOs. Also, commented internal r...José Valim2010-10-113-36/+50
| * | Revert "Make InstanceTagMethods#value_before_type_cast raise if the model don...Santiago Pastorino2010-10-102-38/+3
| * | Always pull in version for frameworks (standardize autoload / require / none)wycats2010-10-105-5/+6
| * | Make ActiveSupport load own version.Barry Sears2010-10-101-0/+1
| * | Do not allow templates coming from Fallback resolvers to store a virtual path.José Valim2010-10-105-4/+29
| * | Use identifiers for template equality.José Valim2010-10-105-10/+46
| * | Fix misleading advice to add 'memcache' to GemfileWincent Colaiuta2010-10-101-1/+1
| * | Override #store to be consistent with #[].Andrea Campi2010-10-102-0/+12
| * | Merge remote branch 'drogus/engines'José Valim2010-10-1014-90/+205
| |\ \
| | * | Add 'foo:install:migrations' task to copy migrations from foo enginePiotr Sarnacki2010-10-092-1/+15
| | * | Load rake tasks defined in superclasses in context of railtiesPiotr Sarnacki2010-10-092-0/+31
| | * | Rename rake railties:copy_migrations to rake railties:install:migrations and ...Piotr Sarnacki2010-10-092-33/+42
| | * | Add callback on skipped migration while copying migrationsPiotr Sarnacki2010-10-092-9/+40
| | * | Change the method for copying migrations, do not add scope.Piotr Sarnacki2010-10-096-30/+60
| | * | Rename namespace method to isolate_namespace.Piotr Sarnacki2010-10-094-21/+21
| * | | Clean up unused methods from AV::Base and pass in the template object on rend...José Valim2010-10-106-31/+33
| * | | Add expire! and rerender to the template API. This will be used by SASS templ...José Valim2010-10-102-5/+67
| * | | Add some unit tests to Template#refresh.José Valim2010-10-101-4/+28
| * | | Update CHANGELOG.José Valim2010-10-103-2/+12
| * | | Add support to render :once.José Valim2010-10-106-29/+139
| * | | Clean up the house before moving in the new furniture.José Valim2010-10-1010-306/+348
| * | | prevent rake test to run the test suite three times when ENV['TEST'] is set [...David Calavera2010-10-102-6/+14
| * | | Rendering doesn't need RackDelegationwycats2010-10-101-1/+0
| * | | Fix a few bugs when trying to use Head standalonewycats2010-10-104-4/+23
| * | | Resolvers now consider timestamps.José Valim2010-10-104-35/+107
| * | | Deprecate old template handler API. Remove old handlers.José Valim2010-10-1023-59/+64
| * | | Add more docs and tests to templates.José Valim2010-10-092-41/+66
| |/ /
| * | Fix error in routing guide edit_photo_path needs the id as paramSantiago Pastorino2010-10-091-1/+1
| * | This test is not only testing config/database stuff anymoreSantiago Pastorino2010-10-091-1/+1