aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'rails/master'Xavier Noria2010-04-1931-55/+214
|\
| * Rails on Rack Rails guide: indicate that Metal pieces now require an "X-Casca...Cheah Chu Yeow2010-04-191-17/+5
| * Fixes to the getting started guideRohit Arondekar2010-04-191-6/+6
| * much complete rdoc for String#ordXavier Noria2010-04-191-3/+19
| * revises the rdoc of String#ordXavier Noria2010-04-191-1/+5
| * AS guide: AS no longer extends PathnameXavier Noria2010-04-191-4/+0
| * fix testing guide: fonts and code formateparreno2010-04-191-15/+15
| * MemoryStore#read_multi(*keys) for dev-mode compatibility with memcache storeJeremy Kemper2010-04-192-1/+14
| * Make the migration generator handle pre-existing migrations with the same tim...Phil Smith2010-04-192-2/+16
| * Merge remote branch 'spastorino/master'Carl Lerche2010-04-185-15/+6
| |\
| | * Missing require addedSantiago Pastorino2010-04-181-0/+1
| | * remove code for Ruby < 1.8.7Santiago Pastorino2010-04-181-12/+0
| | * Missing require addedSantiago Pastorino2010-04-181-0/+1
| | * perform_caching should be accessed through the controller hereSantiago Pastorino2010-04-171-1/+1
| | * perform_caching is now delegated to config on instance and class levelSantiago Pastorino2010-04-171-2/+3
| * | Merge branch 'master' of github.com:rails/railsCarl Lerche2010-04-1818-30/+168
| |\|
| | * added shorthand support for routes like /projects/status(.:format)Diego Carrion2010-04-173-3/+14
| | * removes code written for Ruby < 1.8.7Xavier Noria2010-04-172-19/+0
| | * access assigns as a method or hash, with strings or symbols [#4431 state:reso...David Chelimsky2010-04-172-2/+18
| | * fisting codes so it will parse [#4430 state:resolved]Aaron Patterson2010-04-171-2/+2
| | * Make i18n fallbacks configurable and fallback to the default locale by defaul...Sven Fuchs2010-04-173-0/+125
| | * working around syck defects by optionally matching a space [#4426 state:resol...Aaron Patterson2010-04-171-1/+1
| | * making yaml tests less specific to emitter. [#4425 state:resolved]Aaron Patterson2010-04-171-1/+2
| | * fixing invalid yaml [#4424 state:resolved]Aaron Patterson2010-04-171-1/+2
| | * Added missing requireSantiago Pastorino2010-04-161-0/+1
| | * avoid warning: ambiguous first argument; put parentheses or even spacesSantiago Pastorino2010-04-161-1/+1
| | * Missing requireswycats2010-04-162-0/+2
| * | mail_to with :encode => :javascript now outputs safe htmlSam Elliott2010-04-162-3/+7
| |/
| * Revert "Avoid deprecation warnings and potential TypeErrors [#4404 state:reso...Carl Lerche2010-04-163-4/+3
* | Rails on Rack Rails guide: indicate that Metal pieces now require an "X-Casca...Cheah Chu Yeow2010-04-191-17/+5
* | Cleaned up the table of files created by scaffolding a Post.Rohit Arondekar2010-04-191-4/+4
* | Fixed wrong purpose of _form.html.erbRohit Arondekar2010-04-191-1/+1
* | Replaced ',' with 'or' to make it read better.Rohit Arondekar2010-04-191-1/+1
* | much complete rdoc for String#ordXavier Noria2010-04-181-3/+19
* | revises the rdoc of String#ordXavier Noria2010-04-181-1/+5
* | AS guide: AS no longer extends PathnameXavier Noria2010-04-181-4/+0
* | fix testing guide: fonts and code formateparreno2010-04-171-15/+15
|/
* Merge commit 'docrails/master'Xavier Noria2010-04-164-488/+60
|\
| * Fixing up some errors and changing the observer pattern to a much more simple...Mikel Lindsaar2010-04-171-27/+32
| * Added a note in the section on complex forms regarding nested attributes in 2.3Jared Giles2010-04-151-0/+1
| * fix ActionController font and replace extract_locale_from_uri with extract_lo...eparreno2010-04-151-3/+3
| * Revert "I18n guide: change ActionController by Action Controller in some plac...Xavier Noria2010-04-151-4/+4
| * I18n guide: change ActionController by Action Controller in some places and f...eparreno2010-04-141-4/+4
| * Begun documenting YourApp::Application and how it ties in with the backend.Ryan Bigg2010-04-141-0/+43
| * Rip out bundler notes, they're now living at http://github.com/radar/how-rail...Ryan Bigg2010-04-141-550/+3
| * More expansion on Bundler internals.Ryan Bigg2010-04-141-6/+76
* | Mark the result of grouped_options_for_select as HTML safe [#4322 state:commi...Kieran Pilkington2010-04-162-1/+5
* | Add missing requireSantiago Pastorino2010-04-161-0/+1
* | Bump rack-mount dependency to ~> 0.6.3 for CRITICAL FIXJeremy Kemper2010-04-162-3/+3
* | fixing invalid yaml [#4418 state:resolved]Aaron Patterson2010-04-161-1/+4