aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* 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
* 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
* | Revert "Require rack-mount 0.6.0 since 0.6.1 and later can't be bundled"Jeremy Kemper2010-04-162-3/+3
* | Fix Active Model observer testsJeremy Kemper2010-04-162-2/+4
* | improve how ActiveRecord::Observer defines callbacks on observed modelsMislav Marohnić2010-04-162-7/+24
* | ActiveModel::Observing: stop using Observable Ruby module, re-implement `noti...Mislav Marohnić2010-04-162-7/+36
* | merge callbacks_observers_test.rb into lifecycle_test.rb where other observer...Mislav Marohnić2010-04-162-37/+34
* | fix a failure and some warnings on 1.9.2 [#4417 state:resolved]Aaron Patterson2010-04-162-2/+2
* | page_cache_extension is delegating to config so no need to deprecateSantiago Pastorino2010-04-161-1/+0
* | Added test get to js should have a header with content-type text/javascriptSantiago Pastorino2010-04-161-1/+8
* | Tidy up a bit this test fileSantiago Pastorino2010-04-161-7/+2
* | Revert "Add test case which check content type when rendering rjs" partial in...Santiago Pastorino2010-04-161-9/+1
* | add missing requires to Rescuable and RouteSet [#4415 state:committed]Mislav Marohnić2010-04-162-0/+2
* | Split the observer railtie into two phases.Michael Koziarski2010-04-161-3/+7
* | Make perform_caching work again, with the tests passing and backward compatibleSantiago Pastorino and Carl Lerche2010-04-156-26/+25